root/wq-wms-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:添加工单页面

Browse Source
This commit is contained in:
zhangzq
2026-06-16 15:58:59 +08:00
parent bd52bb055a
commit 78fccd3332
14 changed files with 382 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/mes/service/impl/MesApiServiceImpl.java
View File

@@ -47,7 +47,6 @@ public class MesApiServiceImpl implements MesApiService {
throw new BadRequestException("请传MES失败,未配置MES_URL地址");
}
String url = param.getValue();
// TODO: add demand order API path to EXTConstant once endpoint is confirmed
try {
JSONObject requestParam = new JSONObject();
requestParam.put("OrderCode",workOrder);

2
nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToZDWmdServiceImpl.java
View File

@@ -28,7 +28,6 @@ public class WmsToZDWmdServiceImpl implements WmsToZDWmdService {
public ResponseEntity syncDemandOrder(List<PmDemandDto> demands) {
log.info("syncDemandOrder生产领料需求单下发输入参数：-------------------" + demands.size());
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(SysParamConstant.ZD_URL).getValue();
// TODO: add demand order API path to EXTConstant once endpoint is confirmed
try {
String resultMsg = HttpRequest.post(url)
.body(JSONArray.parseArray(JSON.toJSONString(demands)).toJSONString())
@@ -45,7 +44,6 @@ public class WmsToZDWmdServiceImpl implements WmsToZDWmdService {
public ResponseEntity syncPurchaseReceiving(JSONObject whereJson) {
log.info("syncPurchaseReceiving采购入库单下发输入参数：-------------------" + whereJson.toString());
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(SysParamConstant.ZD_URL).getValue();
// TODO: add purchase receiving API path to EXTConstant once endpoint is confirmed
try {
String resultMsg = HttpRequest.post(url)
.body(whereJson.toString())

1
nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java
View File

@@ -305,7 +305,6 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
.eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
);
}
//TODO：生成手工领料单
final PmStockReturn stockReturn = new PmStockReturn();
stockReturn.setCreate_time(DateUtil.now());
stockReturn.setRequest_type(IOSEnum.BILL_TYPE.code("生产出库"));

3
nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java
View File

@@ -1133,7 +1133,6 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
}
@Override
@Transactional
//TODO：调拨还是直接出库
public void disFinish(List<IOStorInvDis> disList) {
// 完成当前任务对应的所有分配明细
List<OutFinishParam> outFinsParams = new ArrayList<>();
@@ -1191,7 +1190,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
}
}
iStInventoryService.changeInventory(InventoryChangeType.ADD_INV, addInvParams);
//生成调拨入库单据
//TODO：生成调拨入库单据
}
// 如果分配明细全部完成则更新明细表状态
if (countDis == 0){

1
nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inventory/impl/StInventoryServiceImpl.java
View File

@@ -68,7 +68,6 @@ public class StInventoryServiceImpl implements IStInventoryService {
.material_code(invParam.getMaterialCode())
.storagevehicle_code(invParam.getStoragevehicleCode())
.pcsn(invParam.getPcsn())
//TODO:先给默认个
.qty_unit_id(invParam.getUnitId())
.qty_unit_name(invParam.getUnitName())
.qty(invParam.getQty())

11
nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java
View File

@@ -7,6 +7,7 @@ import org.nl.common.domain.query.PageQuery;
import org.nl.common.logging.annotation.Log;
import org.nl.wms.welding_manage.service.work_order.IWorkOrderService;
import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto;
import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -29,9 +30,13 @@ public class WorkOrderController {
@GetMapping
@Log("分页查询工单列表和详情")
public ResponseEntity<Object> query(@RequestParam Map params, PageQuery page)
{
return new ResponseEntity<>(TableDataInfo.build(iWorkOrderService.queryList(page, params)), HttpStatus.OK);
public ResponseEntity<Object> query(WorkOrderQuery query, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(iWorkOrderService.page(page.build(),query.build())), HttpStatus.OK);
}
@GetMapping("/getOrderItem")
@SaIgnore
public ResponseEntity<Object> getOrderItem(String orderCode) {
return new ResponseEntity<>(TableDataInfo.build(iWorkOrderService.getOrderBomItem(orderCode)), HttpStatus.OK);
}
@PostMapping

4
nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java
View File

@@ -3,10 +3,12 @@ package org.nl.wms.welding_manage.service.work_order;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderBomDao;
import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao;
import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
public interface IWorkOrderService extends IService<WorkOrderDao> {
@@ -34,4 +36,6 @@ public interface IWorkOrderService extends IService<WorkOrderDao> {
* 修改工单已使用bom数量
*/
void updateBomUseQty(String id, BigDecimal qty);
List<WorkOrderBomDao> getOrderBomItem(String orderCode);
}

5
nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java
View File

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.lettuce.core.dynamic.annotation.Param;
import org.apache.ibatis.annotations.Select;
import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderBomDao;
import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao;
import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto;
@@ -13,6 +15,9 @@ import java.util.Map;
public interface WorkOrderMapper extends BaseMapper<WorkOrderDao> {
@Select("SELECT * FROM md_work_order_bom WHERE work_order_code = #{orderCode} ORDER BY item_no ASC")
List<WorkOrderBomDao> getOrderBomItem(String orderCode);
/**
* 分页查询工单
* @param page

7
nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dto/WorkOrderQuery.java Normal file
View File

@@ -0,0 +1,7 @@
package org.nl.wms.welding_manage.service.work_order.dto;
import org.nl.common.domain.query.BaseQuery;
import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao;
public class WorkOrderQuery extends BaseQuery<WorkOrderDao> {
}

17
nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/impl/WorkOrderServiceImpl.java
View File

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.exception.BadRequestException;
import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderBomDao;
import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao;
import org.nl.wms.welding_manage.service.work_order.dao.mapper.WorkOrderMapper;
import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto;
@@ -12,7 +15,6 @@ import org.nl.wms.welding_manage.service.work_order.IWorkOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -56,8 +58,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
}
String snListString = record.getWorkOrderSnListString();
if (StringUtils.hasText(snListString)) {
// 按逗号分割字符串，并去除空白字符，转换为List
if (!StringUtils.isEmpty(snListString)){
List<String> snList = Arrays.stream(snListString.split(","))
.map(String::trim)
.filter(s -> !s.isEmpty())
@@ -109,4 +110,12 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
public void updateBomUseQty(String id, BigDecimal qty) {
workOrderMapper.updateBomUseQty(id, qty);
}
}
@Override
public List<WorkOrderBomDao> getOrderBomItem(String orderCode) {
if (StringUtils.isEmpty(orderCode)){
throw new BadRequestException("查询工单明细失败,工单编号为空");
}
return workOrderMapper.getOrderBomItem(orderCode);
}
}