一些优化

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

@@ -7,6 +7,7 @@ package com.nflg.wms.admin.controller;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import com.nflg.wms.admin.pojo.document.SrmMaterialReceiptScanCodes;
 import com.nflg.wms.admin.pojo.dto.QCMaterialSyncDTO;
 import com.nflg.wms.admin.pojo.dto.ZWM3A17DTO;
@@ -29,7 +30,9 @@ import com.nflg.wms.starter.BaseController;
 import com.nflg.wms.starter.annotation.ApiMark;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
+import net.sf.jsqlparser.statement.select.First;
 import org.apache.commons.lang3.tuple.Triple;
+import org.apache.ibatis.annotations.One;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -109,7 +112,7 @@ public class NormalPGIController extends BaseController {
     // 查看扫码记录
     @GetMapping("getScanCodes")
     @ApiMark(moduleName = "送货单管理", apiName = "获取扫码的详情信息")
-    public ApiResult<List<PDAScanCodeVO>> getScanCodes(@RequestParam String orderItemId) {
+    public ApiResult<List<PDAScanCodeVO>> getScanCodes(@RequestParam Long orderItemId) {
         List<SrmMaterialReceiptScanCodes> scanCodes = srmMaterialReceiptCanCodesRepository.findByOrderItemId(orderItemId);
         List<PDAScanCodeVO> pdas = Convert.toList(PDAScanCodeVO.class, scanCodes);
         return ApiResult.success(pdas);
@@ -289,7 +292,7 @@ public class NormalPGIController extends BaseController {
             item.setUpdateUserName(UserUtil.getUserName());
             receiptItems.add(item);
             //储位处理
-            if (!qo.getStorageLocation().equals(qo.getStorageLocationNew())) {
+            if (StrUtil.isNotBlank(qo.getStorageLocationNew()) && qo.getStorageLocation().equals(qo.getStorageLocationNew())) {
                 List<String> bins = Arrays.asList(item.getStorageLocation().split("/"));
                 storageLocationDTOS.add(new StorageLocationDTO()
                         .setBinNos(bins)
@@ -317,18 +320,38 @@ public class NormalPGIController extends BaseController {
             List<ZWM3A17Item1DTO> item1 = zwm3A17DTO.getItem1();
             List<ZWM3A17Item2DTO> item2 = zwm3A17DTO.getItem2();
 
-            List<SrmMaterialReceiptScanCodes> scanCode = srmMaterialReceiptScanCodesRepository.findByOrderItemId(item.getOrderItemId().toString());
+            List<SrmMaterialReceiptScanCodes> scanCode = srmMaterialReceiptScanCodesRepository.findByOrderItemId(item.getOrderItemId());
-            if (CollectionUtil.isEmpty(scanCode)) {
+            if (CollectionUtil.isNotEmpty(scanCode)) {
                 scanCode.forEach(code -> {
                     // 库存
-                    InventoryDTO inventoryDTO = new InventoryDTO()
+                    InventoryDTO inventoryDTO = inventories.stream()
+                            .filter(inventoriesDTO -> inventoriesDTO.getMaterialNo().equals(item.getItemCode())
+                                    && inventoriesDTO.getBatchNumber().equals(code.getBatchNumber())
+                                    && inventoriesDTO.getFactoryNo().equals(wmsPoReceipt.getFactoryCode())
+                                    && inventoriesDTO.getWarehouseNo().equals(item.getReceivedWarehouse())
+                            ).findFirst().orElse(null);
+
+                    if (Objects.isNull(inventoryDTO)) {
+                        inventoryDTO = new InventoryDTO()
                                 .setMaterialNo(item.getItemCode())
                                 .setFactoryNo(wmsPoReceipt.getFactoryCode())
                                 .setWarehouseNo(item.getReceivedWarehouse())
                                 .setBatchNumber(code.getBatchNumber())
                                 .setNum(code.getCodeNum());
                         inventories.add(inventoryDTO);
-
+                    } else {
+                        inventoryDTO.setNum(inventoryDTO.getNum().add(code.getCodeNum()));
+                    }
+                    ZWM3A17Item1DTO ietm1Dto = item1.stream()
+                            .filter(dto1 ->
+                                    dto1.getEBELP().equals(item.getPoLineNumber())
+                                            && dto1.getMATNR().equals(item.getItemCode())
+                                            && dto1.getMeins().equals(item.getUomCode())
+                                            && dto1.getCHARG().equals(code.getBatchNumber())
+                                            && dto1.getWERKS().equals(wmsPoReceipt.getFactoryCode())
+                                            && dto1.getLGORT().equals(item.getReceivedWarehouse())
+                            ).findFirst().orElse(null);
+                    if (Objects.isNull(ietm1Dto)) {
                         item1.add(new ZWM3A17Item1DTO()
                                 .setEBELP(item.getPoLineNumber())
                                 .setMATNR(item.getItemCode())
@@ -339,11 +362,14 @@ public class NormalPGIController extends BaseController {
                                 .setLGORT(item.getReceivedWarehouse())
                                 .setKZKRI("")
                         );
+                    } else {
+                        ietm1Dto.setERFMG(ietm1Dto.getERFMG().add(code.getCodeNum()));
+                    }
 
                     item2.add(new ZWM3A17Item2DTO()
                             .setEBELP(item.getPoLineNumber())
                             .setFLAG("")
-                            .setFLAG(code.getSerialNumbers()));
+                            .setSERNR(code.getSerialNumbers()));
                 });
             } else {
                 // 库存
@@ -423,6 +449,18 @@ public class NormalPGIController extends BaseController {
         List<ZWM3A17Item2DTO> item2 = zwm3A17DTO.getItem2();
         if (CollectionUtil.isNotEmpty(codes)) {
             codes.forEach(code -> {
+                ZWM3A17Item1DTO ietm1Dto = item1.stream()
+                        .filter(dto1 ->
+                                dto1.getEBELP().equals(item.getPoLineNumber())
+                                        && dto1.getMATNR().equals(item.getItemCode())
+                                        && dto1.getWERKS().equals(materialInfoInOrder.getWerks())
+                                        && dto1.getKZKRI().equals(materialInfoInOrder.getKzkri())
+                                        && dto1.getLGORT().equals(materialInfoInOrder.getWarehouseNo())
+                                        && dto1.getCHARG().equals(code.getBatchNumber())
+                                        && dto1.getMeins().equals(materialInfoInOrder.getMeins())
+                        ).findFirst().orElse(null);
+
+                if (Objects.isNull(ietm1Dto)) {
                     item1.add(new ZWM3A17Item1DTO()
                             .setEBELP(item.getPoLineNumber())
                             .setMATNR(item.getItemCode())
@@ -433,6 +471,9 @@ public class NormalPGIController extends BaseController {
                             .setLGORT(materialInfoInOrder.getWarehouseNo())
                             .setKZKRI(materialInfoInOrder.getKzkri())
                     );
+                } else {
+                    ietm1Dto.setERFMG(ietm1Dto.getERFMG().add(code.getCodeNum()));
+                }
                 item2.add(new ZWM3A17Item2DTO()
                         .setEBELP(item.getPoLineNumber())
                         .setFLAG("")

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java

@@ -246,7 +246,7 @@ public class OutProduceController extends BaseController {
     public ApiResult<Void> save1(@Valid @RequestBody @NotEmpty List<Zwm3a07VO> datas) {
         List<String> materialNos = new ArrayList<>();
         datas.forEach(item -> {
-            BigDecimal max = item.getBdmng().subtract(item.getEnmng());
+            BigDecimal max = item.getBdmng();
             if (item.getSqsl().compareTo(max) > 0) {
                 materialNos.add(item.getMatnr());
             }
@@ -257,7 +257,7 @@ public class OutProduceController extends BaseController {
         maps.forEach((key, items) -> {
             WmsOutProduce order = Convert.convert(WmsOutProduce.class, items.get(0));
             order.setNo(NoUtil.getOutProduceNo());
-            order.setType(0);
+            order.setType(1);
             order.setCreateBy(UserUtil.getUserName());
             order.setCreateTime(LocalDateTime.now());
             outProduceService.save(order);
@@ -347,13 +347,14 @@ public class OutProduceController extends BaseController {
                 .setRsnum(order.getRsnum())
                 .setLgort(order.getLgort2())
                 .setItems(datas.stream()
-                        .filter(item -> item.getLockNum().compareTo(BigDecimal.ZERO) > 0)
+                        .filter(item -> item.getSqsl().subtract(item.getNum()).compareTo(BigDecimal.ZERO) > 0)
                         .map(item -> new OutProduceItemVO()
                                 .setLgort2(order.getLgort2())
                                 .setLgpbe(item.getLgpbe())
                                 .setMaktx2(item.getMaktx2())
                                 .setMatnr(item.getMatnr())
-                                .setNum(item.getLockNum())).toList()
+                                .setNum(item.getSqsl().subtract(item.getNum())))
+                        .toList()
                 )
         );
     }

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/POReceiptController.java

@@ -65,7 +65,7 @@ public class POReceiptController {
      */
     @GetMapping("getScanCodes")
     @ApiMark(moduleName = "采购单入库管理", apiName = "获取扫码的详情信息")
-    public ApiResult<List<PDAScanCodeVO>> getScanCodes(@RequestParam String orderItemId) {
+    public ApiResult<List<PDAScanCodeVO>> getScanCodes(@RequestParam Long orderItemId) {
         List<SrmMaterialReceiptScanCodes> scanCodes = srmMaterialReceiptCanCodesRepository.findByOrderItemId(orderItemId);
         List<PDAScanCodeVO> pdas = Convert.toList(PDAScanCodeVO.class, scanCodes);
         return ApiResult.success(pdas);

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QCReceiptController.java

@@ -69,7 +69,7 @@ public class QCReceiptController {
      */
     @GetMapping("getScanCodes")
     @ApiMark(moduleName = "质检物料入库单", apiName = "获取扫码的详情信息")
-    public ApiResult<List<PDAScanCodeVO>> getScanCodes(@RequestParam String orderItemId) {
+    public ApiResult<List<PDAScanCodeVO>> getScanCodes(@RequestParam Long orderItemId) {
         List<SrmMaterialReceiptScanCodes> scanCodes = srmMaterialReceiptCanCodesRepository.findByOrderItemId(orderItemId);
         List<PDAScanCodeVO> pdas = Convert.toList(PDAScanCodeVO.class, scanCodes);
         return ApiResult.success(pdas);

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ScanRecordController.java

@@ -10,7 +10,6 @@ import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.starter.BaseController;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -39,13 +38,21 @@ public class ScanRecordController extends BaseController {
 
     /**
      * 获取钢构包打包扫码记录
-     * @param poNum      采购订单号
+     * @param trayItemId 托盘项id
-     * @param materialNo 物料编号
      */
     @GetMapping("package")
-    public ApiResult<List<PackageMaterialScanRecord>> getScanRecord(@Valid @RequestParam @NotBlank String poNum
+    public ApiResult<List<PackageMaterialScanRecord>> getPackageScanRecord1(@Valid @RequestParam @NotNull Long trayItemId) {
-            , @Valid @RequestParam @NotBlank String materialNo) {
+        return ApiResult.success(packageMaterialScanRecordRepository.findByTrayItemId(trayItemId));
-        return ApiResult.success(packageMaterialScanRecordRepository.findByPoNumAndMaterialNo(poNum, materialNo));
+    }
+
+    /**
+     * 获取钢构包订单扫码记录
+     * @param poNum 采购订单号
+     * @param materialNo 钢构件物料编号
+     */
+    @GetMapping("package1")
+    public ApiResult<List<PackageMaterialScanRecord>> getPackageScanRecord2(String poNum, String materialNo) {
+        return ApiResult.success(packageMaterialScanRecordRepository.findByPoNumAndPackageNo(poNum, materialNo));
     }
 
     /**

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java

@@ -16,6 +16,7 @@ import cn.idev.excel.write.metadata.fill.FillConfig;
 import com.nflg.wms.admin.pojo.document.PackageMaterialScanRecord;
 import com.nflg.wms.admin.pojo.dto.SAPMaterialInfoInOrderDTO;
 import com.nflg.wms.admin.repository.PackageMaterialScanRecordRepository;
+import com.nflg.wms.admin.service.BasdeSerialNumberControllerService;
 import com.nflg.wms.admin.service.BinService;
 import com.nflg.wms.admin.service.SapService;
 import com.nflg.wms.admin.service.StructuralPackageControllerService;
@@ -45,7 +46,6 @@ import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.transaction.annotation.Transactional;
@@ -88,9 +88,6 @@ public class StructuralPackageOrderController extends BaseController {
     @Resource
     private SapService sapService;
 
-    @Resource
-    private StringRedisTemplate stringRedisTemplate;
-
     @Resource
     private FileUploadService fileUploadService;
 
@@ -121,6 +118,9 @@ public class StructuralPackageOrderController extends BaseController {
     @Resource
     private StructuralPackageControllerService structuralPackageControllerService;
 
+    @Resource
+    private BasdeSerialNumberControllerService serialNumberControllerService;
+
     /**
      * 搜索SAP订单
      * @param request 请求参数
@@ -128,13 +128,14 @@ public class StructuralPackageOrderController extends BaseController {
     @PostMapping("searchSAPOrder")
     public ApiResult<List<SAPOrderDTO>> searchSAPOrder(@Valid @RequestBody @NotNull SearchSAPOrderQO request) {
         List<SAPMaterialInfoInOrderDTO> orders = sapService.zim004(request.getOrderNo(), request.getSupplierNo(), request.getMaterialNo());
-        UserSupplier supplier = userSupplierService.getByCode(request.getSupplierNo());
         List<SAPOrderDTO> datas = orders.stream()
-                .map(order -> new SAPOrderDTO()
+                .map(order -> {
+                            UserSupplier supplier = userSupplierService.getByCode(order.getLifnr());
+                            return new SAPOrderDTO()
                                     .setIndex(IdUtil.getSnowflakeNextId())
                                     .setOrderNo(order.getEbeln())
-                        .setSupplierNo(request.getSupplierNo())
+                                    .setSupplierNo(order.getLifnr())
-                        .setSupplierName(supplier.getSupplierName())
+                                    .setSupplierName(Objects.isNull(supplier) ? "" : supplier.getSupplierName())
                                     .setOrderRowNo(order.getEbelp())
                                     .setMaterialNo(order.getMatnr())
                                     .setMaterialDesc(order.getMaktx())
@@ -143,7 +144,8 @@ public class StructuralPackageOrderController extends BaseController {
                                     .setTransportNum(order.getTransportNum())
                                     .setLbprt(order.getLbprt())
                                     .setUnit(order.getMeins())
-                        .setKzkri(order.getKzkri())
+                                    .setKzkri(order.getKzkri());
+                        }
                 )
                 .toList();
         if (Objects.equals(request.getType(), 1)) {
@@ -227,7 +229,7 @@ public class StructuralPackageOrderController extends BaseController {
                     .throwMessage("单据号不一致");
             orderNo = deliverStructuralPackageOrderService.getById(ids.get(0)).getOrderNo();
         } else {
-            orderNo = getDeliverNormalOrderNo();
+            orderNo = serialNumberControllerService.generateSerialNumber(3);
         }
         request.getItems().forEach(orderQO -> {
             WmsStructuralPackageOrder order = Convert.convert(WmsStructuralPackageOrder.class, orderQO);
@@ -275,11 +277,6 @@ public class StructuralPackageOrderController extends BaseController {
         return ApiResult.success();
     }
 
-    private String getDeliverNormalOrderNo() {
-        Long index = stringRedisTemplate.opsForValue().increment("package:trayNo:index");
-        return "S" + NoUtil.getForOrderNo() + StrUtil.padPre(String.valueOf(index), 4, "0");
-    }
-
     /**
      * 搜索
      * @param request 请求参数
@@ -321,10 +318,10 @@ public class StructuralPackageOrderController extends BaseController {
         vo.setItems(items.stream().map(item -> {
             WmsStructuralPackageOrderTray tray = trays.stream().filter(it -> Objects.equals(it.getId(), item.getTrayId())).findFirst().get();
             TrayItemVO ivo = Convert.convert(TrayItemVO.class, item);
-            if (tray.getState() > 0) {
-                ivo.setScanCount(1);
-            }
             ivo.setNo(tray.getNo());
+            if (Objects.equals(tray.getState(), (short) 3)) {
+                ivo.setStoreNum(item.getShipmentNum());
+            }
             return ivo;
         }).toList());
 //        SAPMaterialInfoInOrderDTO dto = sapService.zim004(orderVO.getExternalOrderNo(), orderVO.getSupplierCode(), orderVO.getPackageNo()).get(0);
@@ -510,6 +507,7 @@ public class StructuralPackageOrderController extends BaseController {
     public ApiResult<DeliverStructuralPackageOrderTrayVO> getTrayInfoByNo(@Valid @RequestParam @NotBlank String trayNo) {
         DeliverStructuralPackageOrderTrayVO vo = deliverStructuralPackageOrderTrayService.getInfoByNo(trayNo);
         VUtil.trueThrowBusinessError(Objects.isNull(vo)).throwMessage("无效的托盘号");
+        VUtil.trueThrowBusinessError(!Objects.equals(vo.getState(), 0)).throwMessage("该托盘已打包");
         vo.setItems(deliverStructuralPackageOrderTrayItemService.getSimpleListByTrayNo(trayNo));
         return ApiResult.success(vo);
     }
@@ -524,16 +522,24 @@ public class StructuralPackageOrderController extends BaseController {
         WmsStructuralPackageOrderTray tray = deliverStructuralPackageOrderTrayService.lambdaQuery().eq(WmsStructuralPackageOrderTray::getNo, request.getTrayNo()).one();
         VUtil.trueThrowBusinessError(Objects.isNull(tray)).throwMessage("托盘不存在");
         VUtil.trueThrowBusinessError(!Objects.equals(tray.getState(), OrderState.Unpackaged.getState())).throwMessage("请勿重复打包");
+        DeliverStructuralPackageOrderVO order = deliverStructuralPackageOrderService.getInfo(tray.getOrderId());
         List<DeliverStructuralPackageOrderTrayItemVO> trayItemVOS = deliverStructuralPackageOrderTrayItemService.getListByTrayId(tray.getId());
         List<String> materialNos = new ArrayList<>();
         List<StructuralPackageMaterialQRCodeContentDTO> qrCodeDTOs = request.getQrCodes().stream().map(NoUtil::getStructuralPackageMaterialQRCodeContent).toList();
         trayItemVOS.forEach(it -> {
-            if (it.getShipmentNum().compareTo(qrCodeDTOs.stream()
+            List<StructuralPackageMaterialQRCodeContentDTO> dtos = qrCodeDTOs.stream()
                     .filter(qr -> StrUtil.equals(qr.getMaterialNo(), it.getMaterialNo()))
+                    .toList();
+            if (it.getShipmentNum().compareTo(dtos.stream()
                     .map(StructuralPackageMaterialQRCodeContentDTO::getNum)
                     .reduce(BigDecimal.ZERO, BigDecimal::add)) != 0) {
                 materialNos.add(it.getMaterialNo());
             }
+            dtos.forEach(dto -> {
+                dto.setPoNum(order.getExternalOrderNo());
+                dto.setPackageNo(order.getPackageNo());
+                dto.setTrayItemId(it.getId());
+            });
         });
         VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(materialNos))
                 .throwMessage("以下物料的数量与托盘数量不一致:" + StrUtil.join(",", materialNos));
@@ -561,6 +567,9 @@ public class StructuralPackageOrderController extends BaseController {
                     .setContent(qrCode.getContent())
                     .setMaterialNo(qrCode.getMaterialNo())
                     .setTrayNo(qrCode.getTrayNo())
+                    .setPoNum(qrCode.getPoNum())
+                    .setPackageNo(qrCode.getPackageNo())
+                    .setTrayItemId(qrCode.getTrayItemId())
                     .setType(type)
                     .setNum(qrCode.getNum())
                     .setCreateBy(UserUtil.getUserName())
@@ -616,7 +625,9 @@ public class StructuralPackageOrderController extends BaseController {
                 .setCreateBy(UserUtil.getUserName())
                 .setCreateTime(LocalDateTime.now());
         structuralPackageDeliverOrderService.save(deliverOrder);
-        structuralPackageDeliverOrderMapService.saveBatch(trays.stream().map(DeliverStructuralPackageOrderExtendVO::getTrayId).distinct().map(id ->
+        structuralPackageDeliverOrderMapService.saveBatch(trays.stream()
+                .map(DeliverStructuralPackageOrderExtendVO::getId)
+                .distinct().map(id ->
                         new WmsStructuralPackageDeliverOrderMap()
                                 .setDeliverId(deliverOrder.getId())
                                 .setOrderId(id)).toList());
@@ -767,6 +778,7 @@ public class StructuralPackageOrderController extends BaseController {
                         .setKzkri(order.getKzkri())
                         .setUnqualifiedQty(BigDecimal.ZERO)
                         .setQualifiedQty(BigDecimal.valueOf(order.getNum()))
+                        .setInspectionQty(BigDecimal.valueOf(order.getNum()))
                         .setFactory("1010")
                         .setDataStatus((short) 0)
                         .setReceivedWarehouse(storageService.getWarehouseNo("1010", order.getPackageNo()))
@@ -784,7 +796,7 @@ public class StructuralPackageOrderController extends BaseController {
      * @param no 任务单号或原始单号
      */
     @GetMapping("searchIn")
-    public ApiResult<List<InTaskVO>> searchIn(@Valid @RequestParam @NotBlank String no) {
+    public ApiResult<List<InTaskVO>> searchIn(@Valid @RequestParam(required = false) String no) {
         return ApiResult.success(inTaskService.searchForIn(no));
     }
 
@@ -813,6 +825,7 @@ public class StructuralPackageOrderController extends BaseController {
      * 上架（PDA使用）
      * @param request 请求参数
      */
+    @Transactional
     @PostMapping("materialStorage")
     public ApiResult<Void> materialStorage(@Valid @RequestBody @NotNull MaterialStorageQO request) {
         WmsInTask task = inTaskService.getByNo(request.getTaskNo());
@@ -820,12 +833,19 @@ public class StructuralPackageOrderController extends BaseController {
         VUtil.trueThrowBusinessError(!Objects.equals(task.getTaskStatus(), (short) 0)).throwMessage("请勿重复上架");
         List<WmsInTaskItem> datas = inTaskItemService.getForIn(request);
         if (CollectionUtil.isNotEmpty(datas)) {
+            datas.forEach(it -> {
+                MaterialStorageItemQO qo = request.getItems().stream().filter(r -> StrUtil.equals(r.getMaterialNo(), it.getItemCode())).findFirst().get();
+                it.setReceivedQty(it.getInspectionQty().subtract(qo.getNum()));
+                it.setBins(StrUtil.join(",", qo.getBinNos()));
+                it.setDataStatus((short) 1);
+            });
+            inTaskItemService.updateBatchById(datas);
+            inTaskService.updateState(request.getTaskNo());
             datas.stream()
                     .filter(it -> request.getItems().stream().anyMatch(r -> StrUtil.equals(r.getMaterialNo(), it.getItemCode())))
                     .collect(Collectors.groupingBy(WmsInTaskItem::getPoNum))
                     .values()
                     .forEach(it -> structuralPackageControllerService.materialStorage(it, request.getItems()));
-            inTaskService.updateState(request.getTaskNo());
         }
         return ApiResult.success();
     }

nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/PackageMaterialScanRecord.java

@@ -61,6 +61,11 @@ public class PackageMaterialScanRecord {
      */
     private Integer type;
 
+    /**
+     * 钢构件编号
+     */
+    private String packageNo;
+
     /**
      * 托盘项ID
      */

nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/SAPMaterialInfoInOrderDTO.java

@@ -117,7 +117,4 @@ public class SAPMaterialInfoInOrderDTO {
      * 供应商账号
      */
     private String lifnr;
-
-
-
 }

nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/PackageMaterialScanRecordRepository.java

@@ -9,7 +9,9 @@ import java.util.List;
 @Repository
 public interface PackageMaterialScanRecordRepository extends MongoRepository<PackageMaterialScanRecord, String> {
 
-    List<PackageMaterialScanRecord> findByPoNumAndMaterialNo(String poNum, String materialNo);
+    List<PackageMaterialScanRecord> findByPoNumAndPackageNo(String poNum, String packageNo);
 
     void removeByTrayNo(String trayNo);
+
+    List<PackageMaterialScanRecord> findByTrayItemId(Long trayItemId);
 }

nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/SrmMaterialReceiptScanCodesRepository.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 @Repository
 public interface SrmMaterialReceiptScanCodesRepository extends MongoRepository<SrmMaterialReceiptScanCodes, String> {
-    List<SrmMaterialReceiptScanCodes> findByOrderItemId(String orderItemId);
+    List<SrmMaterialReceiptScanCodes> findByOrderItemId(Long orderItemId);
 
     List<SrmMaterialReceiptScanCodes> findByCodeIdIn(List<String> attr0);
 }

nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java

@@ -293,6 +293,7 @@ public class NormalPGIControllerService {
                     .update();
         }
         if (CollectionUtil.isNotEmpty(inventories)) {
+
             inventoryService.in(inventories);
         }
 
@@ -311,7 +312,7 @@ public class NormalPGIControllerService {
                 wmsPoReceiptItemService.lambdaUpdate()
                         .eq(WmsPoReceiptItem::getPoNum, zwm3A17DTO.getEbeln())
                         .eq(WmsPoReceiptItem::getReceiveId, taskId)
-                        .set(WmsPoReceiptItem::getMaterialDoc, returnDto.getValue().getKey())
+                        .set(WmsPoReceiptItem::getMaterialDoc, returnDto.getKey().getKey())
                         .set(WmsPoReceiptItem::getMaterialDocYear, returnDto.getValue().getValue())
                         .update();
             }

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

@@ -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

nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java

@@ -75,13 +75,19 @@ public class SapService {
 
         JCoFunction function = exec("ZWM00_MB007", parameters);
 
-        JCoStructure sreturn = function.getExportParameterList().getStructure("E_RETURN");
+        JCoStructure eReturn = function.getExportParameterList().getStructure("E_RETURN");
-        log.info("sreturn:" + sreturn);
+        print("E_RETURN", eReturn);
-        VUtil.trueThrowBusinessError(!StrUtil.equals(sreturn.getString("TYPE"), "S"))
+        JCoStructure eOutput = function.getExportParameterList().getStructure("E_OUTPUT");
-                .throwMessage("SAP错误:" + sreturn.getString("MESSAGE"));
+        print("E_OUTPUT", eOutput);
 
-        JCoStructure structure = function.getExportParameterList().getStructure("E_OUTPUT");
+        ZWM00MB007DTO dto = JCoUtil.toBean(eOutput, ZWM00MB007DTO.class);
-        return JCoUtil.toBean(structure, ZWM00MB007DTO.class);
+        if (StrUtil.isBlank(dto.getAufnr())) {
+            VUtil.trueThrowBusinessError(!StrUtil.equals(eReturn.getString("TYPE"), "S"))
+                    .throwMessage("SAP错误:" + eReturn.getString("MESSAGE"));
+            return null;
+        } else {
+            return dto;
+        }
     }
 
     /**

nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java

@@ -420,7 +420,6 @@ public class StructuralPackageControllerService {
     @Transactional
     public void materialStorage(List<WmsInTaskItem> list, List<MaterialStorageItemQO> items) {
         items.forEach(this::syncStorage);
-        try {
         inventoryService.in(list.stream().map(it -> new InventoryDTO()
                         .setMaterialNo(it.getItemCode())
                         .setBatchNumber(it.getBatchNumber())
@@ -435,17 +434,8 @@ public class StructuralPackageControllerService {
             it.setDocYear101(pair.getKey().getValue());
             it.setMatDoc103(pair.getValue().getKey());
             it.setDocYear103(pair.getValue().getValue());
-                it.setDataStatus((short) 1);
-                it.setStorageLocation(StrUtil.join(",", items.stream()
-                        .filter(f -> f.getMaterialNo().equals(it.getItemCode()))
-                        .findFirst()
-                        .get()
-                        .getBinNos()));
         });
-            inTaskItemService.saveBatch(list);
+        inTaskItemService.updateBatchById(list);
-        } catch (Exception ex) {
-            saveSapError(list, ex.getMessage());
-        }
     }
 
     @Transactional(propagation = Propagation.REQUIRES_NEW)
@@ -453,7 +443,7 @@ public class StructuralPackageControllerService {
         list.forEach(it -> {
             it.setFailResult(msg);
         });
-        inTaskItemService.saveBatch(list);
+        inTaskItemService.updateBatchById(list);
     }
 
     /**
@@ -466,7 +456,7 @@ public class StructuralPackageControllerService {
                 .setItem1(list.stream().map(it -> new ZWM3A17Item1DTO()
                                 .setEBELP(it.getPoLineNumber())
                                 .setMATNR(it.getItemCode())
-                                .setERFMG(it.getInspectionQty())
+                                .setERFMG(it.getReceivedQty())
                                 .setMEINS(it.getUnit())
                                 .setCHARG(it.getBatchNumber())
                                 .setWERKS(it.getFactory())

nflg-wms-admin/src/main/resources/template/成本中心退料单.html

@@ -177,7 +177,7 @@
                 <td th:text="${iterStat.count}">序号</td>
                 <td th:text="${item.matnr}">物料号</td>
                 <td th:text="${item.maktx}" class="col-left">非金属联件和紧固件等 M6 DIN 982 不锈钢304</td>
-                <td th:text="${item.lgort}">收料库</td>
+                <td th:text="${info.lgort}">收料库</td>
                 <td th:text="${item.matkl}">物料组</td>
                 <td th:text="${item.meins}">单位</td>
                 <td th:text="${item.num}">1000.00</td>

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/StructuralPackageMaterialQRCodeContentDTO.java

@@ -24,6 +24,21 @@ public class StructuralPackageMaterialQRCodeContentDTO {
      */
     private String trayNo;
 
+    /**
+     * 采购订单号
+     */
+    private String poNum;
+
+    /**
+     * 钢构件编号
+     */
+    private String packageNo;
+
+    /**
+     * 托盘项ID
+     */
+    private Long trayItemId;
+
     /**
      * 数量
      */

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM00MB007DTO.java

@@ -1,5 +1,6 @@
 package com.nflg.wms.common.pojo.dto;
 
+import cn.hutool.core.util.StrUtil;
 import com.nflg.wms.common.util.BomUtil;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -15,11 +16,19 @@ public class ZWM00MB007DTO {
      */
     private String aufnr;
 
+    public String getAufnr() {
+        return StrUtil.removeAllPrefix(aufnr, "0");
+    }
+
     /**
      * 物料号
      */
     private String matnr;
 
+    public String getMatnr() {
+        return StrUtil.removeAllPrefix(matnr, "0");
+    }
+
     /**
      * 物料描述
      */
@@ -41,7 +50,7 @@ public class ZWM00MB007DTO {
     private BigDecimal psmng;
 
     /**
-     * 已收货数量
+     * 此订单项的收货数量
      */
     private BigDecimal wemng;
 
@@ -58,4 +67,9 @@ public class ZWM00MB007DTO {
     public String getMeins() {
         return BomUtil.changeMeins(meins);
     }
+
+    /**
+     * 序列号
+     */
+    private String sernr;
 }

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialStorageItemQO.java

@@ -1,5 +1,6 @@
 package com.nflg.wms.common.pojo.qo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
@@ -42,5 +43,6 @@ public class MaterialStorageItemQO {
     /**
      * 越库数量
      */
+    @JsonIgnore
     private BigDecimal num = BigDecimal.ZERO;
 }

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageDeliverOrderSaveItemQO.java

@@ -74,11 +74,10 @@ public class PackageDeliverOrderSaveItemQO {
     @NotBlank
     private String unit;
 
-//    /**
+    /**
-//     * 标志：关键部件
+     * 标志：关键部件
-//     */
+     */
-//    @NotBlank
+    private String kzkri;
-//    private String kzkri;
 
     @JsonIgnore
     private String key1;

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SearchSAPOrderQO.java

@@ -1,6 +1,5 @@
 package com.nflg.wms.common.pojo.qo;
 
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -16,7 +15,6 @@ public class SearchSAPOrderQO {
     /**
      * 供应商编号
      */
-    @NotBlank
     private String supplierNo;
 
     /**

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java

@@ -81,7 +81,7 @@ public class DeliverStructuralPackageOrderForPackageItemVO {
     /**
      * 机台号
      */
-    private Long workbenchCode;
+    private String workbenchCode;
 
     /**
      * 托盘数量

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderTrayItemSimpleVO.java

@@ -18,7 +18,7 @@ public class DeliverStructuralPackageOrderTrayItemSimpleVO {
     private String materialDesc;
 
     /**
-     * 计划数量
+     * 出货数量
      */
-    private BigDecimal planNum;
+    private BigDecimal shipmentNum;
 }

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderTrayVO.java

@@ -8,7 +8,6 @@ import java.util.List;
 @Data
 public class DeliverStructuralPackageOrderTrayVO {
 
-
     /**
      * 供应商代码
      */
@@ -44,5 +43,10 @@ public class DeliverStructuralPackageOrderTrayVO {
      */
     private BigDecimal num;
 
+    /**
+     * 状态，0：未打包；1：已打包；2-在途；3：已收货
+     */
+    private Integer state;
+
     private List<DeliverStructuralPackageOrderTrayItemSimpleVO> items;
 }

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceOrderMaterialVO.java

@@ -35,7 +35,7 @@ public class InProduceOrderMaterialVO {
     /**
      * 订单数量
      */
-    private BigDecimal oderNum;
+    private BigDecimal orderNum;
 
     /**
      * 数量

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/POReceiptVO.java

@@ -44,7 +44,7 @@ public class POReceiptVO {
     /**
      * 发货时间
      */
-    private LocalDate deliveryNoteDate;
+    private String deliveryNoteDate;
 
     /**
      * 运单号

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayItemVO.java

@@ -10,6 +10,8 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 public class TrayItemVO {
 
+    private Long id;
+
     /**
      * 托盘编号
      */
@@ -59,5 +61,5 @@ public class TrayItemVO {
     /**
      * 条码数量
      */
-    private Integer scanCount = 0;
+    private String codeNum = "点击查看";
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInTaskItem.java

@@ -135,6 +135,11 @@ public class WmsInTaskItem implements Serializable {
      */
     private BigDecimal inspectionQty;
 
+    /**
+     * 实际收货数量
+     */
+    private BigDecimal receivedQty;
+
     /**
      * 101物料凭证编号
      */
@@ -144,7 +149,7 @@ public class WmsInTaskItem implements Serializable {
     /**
      * 101物料凭证年度
      */
-    @TableField("mat_doc_101")
+    @TableField("doc_year_101")
     private String docYear101;
 
     /**
@@ -156,7 +161,7 @@ public class WmsInTaskItem implements Serializable {
     /**
      * 103物料凭证年度
      */
-    @TableField("mat_doc_103")
+    @TableField("doc_year_103")
     private String docYear103;
 
     /**
@@ -175,4 +180,9 @@ public class WmsInTaskItem implements Serializable {
      * 标志：关键部件
      */
     private String kzkri;
+
+    /**
+     * 实际上架储位
+     */
+    private String bins;
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInTaskServiceImpl.java

@@ -58,7 +58,6 @@ public class WmsInTaskServiceImpl extends ServiceImpl<WmsInTaskMapper, WmsInTask
                                 .setTaskNumber(taskNumber)
                                 .setOrderNumber(task.getNoteNum())
                                 .setCreateTime(LocalDateTime.now())
-                                .setUpdateTime(LocalDateTime.now())
                         );
                     }
                 } else {

nflg-wms-repository/src/main/resources/mapper/WmsInTaskItemMapper.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.nflg.wms.repository.mapper.WmsInTaskItemMapper">
-
 </mapper>

nflg-wms-repository/src/main/resources/mapper/WmsInTaskMapper.xml

@@ -6,9 +6,10 @@
         SELECT *
         FROM wms_in_task
         where task_status = 0
-        <if test="request.no != null and request.no!=''">
+        <if test="no != null and no!=''">
-            AND task_number like CONCAT('%', #{request.no}, '%')
+            AND task_number like CONCAT('%', #{no}, '%')
         </if>
+        order by id desc
     </select>
 
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.InTaskVO">
@@ -25,5 +26,6 @@
                 AND task_number like CONCAT('%', #{request.no}, '%')
             </if>
         </where>
+        order by id desc
     </select>
 </mapper>

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

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

nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml

@@ -53,11 +53,7 @@
 
     <select id="getUnCompletedItem" resultType="com.nflg.wms.repository.entity.WmsSrmOrder">
         select id
-        from wms_srm_order
-        where id = #{orderId}
-          and not exists(select 1
         from wms_srm_order_item
-                         where wms_srm_order.id = wms_srm_order_item.order_id
+        where order_id = #{orderId}
-                           and wms_srm_order_item.delivery_qty > wms_srm_order_item.receipt_qty)
+          and wms_srm_order_item.delivery_qty > wms_srm_order_item.receipt_qty</select>
-    </select>
 </mapper>

nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml

@@ -32,6 +32,7 @@
                 and pdo.create_time <= #{request.endDate}
             </if>
         </where>
+        order by pdo.id desc
     </select>
 
     <select id="getIdsByExternalOrderNo" resultType="java.lang.Long">

nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml

@@ -76,7 +76,8 @@
     </select>
 
     <select id="getInfoByNo" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayVO">
-        SELECT o.external_order_no,o.row_no,sp."no" AS "package_no",sp."name" AS "package_desc",ot.num,us.supplier_name,us.supplier_code
+        SELECT o.external_order_no,o.row_no,sp."no" AS "package_no",sp."name" AS "package_desc",ot.num,us.supplier_name
+            ,us.supplier_code,ot.state
         FROM wms_structural_package_order o
                  LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
                  LEFT JOIN user_supplier us ON o.supplier_id=us.user_id

nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyMapper.xml

@@ -34,5 +34,6 @@
                 and lgfsb1 like concat('%',#{request.lgfsb1},'%')
             </if>
         </where>
+        order by id desc
     </select>
 </mapper>

nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyTicketItemMapper.xml

@@ -7,5 +7,6 @@
         FROM wms_transfer_company_ticket_item tcti
         INNER JOIN  wms_transfer_company_item tci ON tcti.order_item_id=tci."id"
         WHERE tcti.ticket_id=#{id}
+        order by tcti.id desc
     </select>
 </mapper>

nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyTicketMapper.xml

@@ -35,6 +35,7 @@
                 and lgfsb1 like concat('%',#{request.lgfsb1},'%')
             </if>
         </where>
+        order by tct.id desc
     </select>
 
     <select id="getInfo" resultType="com.nflg.wms.common.pojo.vo.TransferCompanyTicketVO">

nflg-wms-repository/src/main/resources/mapper/WmsTransferFactoryMapper.xml

@@ -28,5 +28,6 @@
                 and werks like concat('%',#{request.werks},'%')
             </if>
         </where>
+        order by id desc
     </select>
 </mapper>

nflg-wms-repository/src/main/resources/mapper/WmsTransferFactoryTicketItemMapper.xml

@@ -7,5 +7,6 @@
         from wms_transfer_factory_item tfi
         inner join wms_transfer_factory_ticket_item tfti on tfi.id = tfti.order_item_id
         where tfti.ticket_id = #{id}
+        order by tfi.id desc
     </select>
 </mapper>

nflg-wms-repository/src/main/resources/mapper/WmsTransferFactoryTicketMapper.xml

@@ -29,6 +29,7 @@
                 and werks like concat('%',#{request.werks},'%')
             </if>
         </where>
+        order by tft.id desc
     </select>
 
     <select id="getInfo" resultType="com.nflg.wms.common.pojo.vo.TransferFactoryTicketInfoVO">

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

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