rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

质检物料入库

This commit is contained in:
zhangke 2025-09-05 15:53:13 +08:00
parent 382cee9ca1
commit 9e01b73fca
4 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
View File

@ -449,16 +449,31 @@ public class NormalPGIController extends BaseController {
List<ZWM3A17Item2DTO> item2 = zwm3A17DTO.getItem2(); List<ZWM3A17Item2DTO> item2 = zwm3A17DTO.getItem2();
if (CollectionUtil.isNotEmpty(codes)) { if (CollectionUtil.isNotEmpty(codes)) {
codes.forEach(code -> { codes.forEach(code -> {
item1.add(new ZWM3A17Item1DTO() ZWM3A17Item1DTO ietm1Dto = item1.stream()
.setEBELP(item.getPoLineNumber()) .filter(dto1 ->
.setMATNR(item.getItemCode()) dto1.getEBELP().equals(item.getPoLineNumber())
.setERFMG(code.getCodeNum()) && dto1.getMATNR().equals(item.getItemCode())
.setMEINS(materialInfoInOrder.getMeins()) && dto1.getWERKS().equals(materialInfoInOrder.getWerks())
.setCHARG(code.getBatchNumber()) && dto1.getKZKRI().equals(materialInfoInOrder.getKzkri())
.setWERKS(materialInfoInOrder.getWerks()) && dto1.getLGORT().equals(materialInfoInOrder.getWarehouseNo())
.setLGORT(materialInfoInOrder.getWarehouseNo()) && dto1.getCHARG().equals(code.getBatchNumber())
.setKZKRI(materialInfoInOrder.getKzkri()) && dto1.getMeins().equals(materialInfoInOrder.getMeins())
); ).findFirst().orElse(null);
if (Objects.isNull(ietm1Dto)) {
item1.add(new ZWM3A17Item1DTO()
.setEBELP(item.getPoLineNumber())
.setMATNR(item.getItemCode())
.setERFMG(code.getCodeNum())
.setMEINS(materialInfoInOrder.getMeins())
.setCHARG(code.getBatchNumber())
.setWERKS(materialInfoInOrder.getWerks())
.setLGORT(materialInfoInOrder.getWarehouseNo())
.setKZKRI(materialInfoInOrder.getKzkri())
);
} else {
ietm1Dto.setERFMG(ietm1Dto.getERFMG().add(code.getCodeNum()));
}
item2.add(new ZWM3A17Item2DTO() item2.add(new ZWM3A17Item2DTO()
.setEBELP(item.getPoLineNumber()) .setEBELP(item.getPoLineNumber())
.setFLAG("") .setFLAG("")

7
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java
View File

@ -70,9 +70,10 @@ public class NormalQMControllerService {
} }
} }
} }
return tasks.stream() return tasks;
.filter(task -> task.getInQty().compareTo(BigDecimal.ZERO) > 0) // return tasks.stream()
.toList(); // .filter(task -> task.getInQty().compareTo(BigDecimal.ZERO) > 0)
// .toList();
} }
@Transactional @Transactional

2
nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml
View File

@ -9,7 +9,7 @@
create_time, create_time,
factory_code factory_code
from wms_qc_receive from wms_qc_receive
where is_completed = 0 where is_completed = 0 and is_check = true
<if test="orderNo != null and orderNo != ''"> <if test="orderNo != null and orderNo != ''">
and ( in_no like concat( '%',#{orderNo},'%') or order_no like concat( '%',#{orderNo},'%') ) and ( in_no like concat( '%',#{orderNo},'%') or order_no like concat( '%',#{orderNo},'%') )
</if> </if>

3
nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/SRMController.java
View File

@ -2,6 +2,7 @@ package com.nflg.wms.srm.receive.controller;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.nflg.wms.common.pojo.dto.SRMOrderReceiveDTO; import com.nflg.wms.common.pojo.dto.SRMOrderReceiveDTO;
@ -151,7 +152,7 @@ public class SRMController extends BaseController {
.setSupplerNum(data.getSupplierNum()) .setSupplerNum(data.getSupplierNum())
.setInspectionType(data.getInspectionType()) .setInspectionType(data.getInspectionType())
.setPoLineNumber(String.valueOf(data.getPoLineNumber())) .setPoLineNumber(String.valueOf(data.getPoLineNumber()))
.setInspectionQty(data.getInspectionQty()) .setInspectionQty(ObjectUtil.defaultIfNull(data.getInspectionQty(), BigDecimal.ZERO))
.setItemName(data.getItemName()) .setItemName(data.getItemName())
.setUnit(data.getUnit()) .setUnit(data.getUnit())
.setReceivedWarehouse(data.getReceivedWarehouse()) .setReceivedWarehouse(data.getReceivedWarehouse())