接收质检物料的接口调整

Merge remote-tracking branch 'origin/develop' into dev_zhangke
一些优化
2025-09-08 11:51:34 +08:00 · 2025-09-08 10:32:33 +08:00 · 2025-09-07 16:43:17 +08:00 · 2025-09-05 18:57:17 +08:00
58 changed files with 319 additions and 153 deletions
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/config/LdapConfig.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/config/LdapConfig.java
@ -3,6 +3,7 @@ package com.nflg.wms.admin.config;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.ldap.core.support.LdapContextSource;

 import java.util.HashMap;
@ -24,6 +25,7 @@ public class LdapConfig {
    private String password;

    @Bean
+    @Lazy
    public LdapContextSource ldapContextSource() {
        LdapContextSource contextSource = new LdapContextSource();
        contextSource.setUrl(ldapUrl);
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/config/PowerJobClientConfig.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/config/PowerJobClientConfig.java
@ -20,6 +20,7 @@ public class PowerJobClientConfig {
    private String password;

    @Bean
+    @Lazy
    public PowerJobClient initPowerJobClient() {
        return new PowerJobClient(serverAddress, appName, password);
    }
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/config/RestTemplateConfig.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/config/RestTemplateConfig.java
@ -2,6 +2,7 @@ package com.nflg.wms.admin.config;

 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;

@ -9,6 +10,7 @@ import org.springframework.web.client.RestTemplate;
 public class RestTemplateConfig {

    @Bean
+    @Lazy
    public RestTemplate restTemplate() {
        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
        factory.setConnectTimeout(3_000);
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/config/SAPConfig.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/config/SAPConfig.java
@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;

 import java.util.HashMap;
 import java.util.Map;
@ -96,6 +97,7 @@ public class SAPConfig {
    }

    @Bean
+    @Lazy
    public JCoRepository getJCoRepository() throws JCoException {
        return jcoDestination().getRepository();
    }
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/config/ThymeleafConfig.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/config/ThymeleafConfig.java
@ -2,6 +2,7 @@ package com.nflg.wms.admin.config;

 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.thymeleaf.ITemplateEngine;
 import org.thymeleaf.spring6.SpringTemplateEngine;
 import org.thymeleaf.templateresolver.ITemplateResolver;
@ -10,6 +11,7 @@ import org.thymeleaf.templateresolver.ITemplateResolver;
 public class ThymeleafConfig {

    @Bean
+    @Lazy
    public ITemplateEngine templateEngine(ITemplateResolver templateResolver) {
        SpringTemplateEngine engine = new SpringTemplateEngine();
        engine.setTemplateResolver(templateResolver);
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java
@ -212,13 +212,15 @@ public class InCostCenterBackController extends BaseController {
                    .setId(IdUtil.getSnowflakeNextId())
                    .setTicketId(ticket.getId())
                    .setOrderItemId(item.getId())
-                    .setLgpbe(StrUtil.join(",", it.getLgpbe()))
+                    .setLgpbe(StrUtil.join(",", it.getBinNos()))
                    .setNum(BigDecimal.ZERO);
            ticketItems.add(ti);
            it.getQrCodes().forEach(qrCode -> {
                MaterialQRCodeContentDTO qrCodeContent = NoUtil.getMaterialQRCodeContent(qrCode);
                dtos.add(qrCodeContent);
                String materialNo = qrCodeContent.getMaterialNo();
+                VUtil.trueThrowBusinessError(!StrUtil.equals(materialNo, item.getMatnr()))
+                        .throwMessage("订单项与物料不符");
                item.setLeft(item.getLeft().subtract(qrCodeContent.getNum()));
                VUtil.trueThrowBusinessError(item.getLeft().compareTo(BigDecimal.ZERO) < 0)
                        .throwMessage("物料" + materialNo + "的入库数量超出申请数量");
@ -241,6 +243,14 @@ public class InCostCenterBackController extends BaseController {
        inCostcenterBackItemService.updateBatchById(datas);
        inMaterialScanRecordRespository.saveAll(records);
        inCostcenterBackTicketItemService.saveBatch(ticketItems);
+        inCostcenterBackService.lambdaUpdate()
+                .set(WmsInCostcenterBack::getSapStatus, true)
+                .set(WmsInCostcenterBack::getSapError, "")
+                .set(WmsInCostcenterBack::getUpdateBy, UserUtil.getUserName())
+                .set(WmsInCostcenterBack::getUpdateTime, LocalDateTime.now())
+                .set(WmsInCostcenterBack::getState, datas.stream().map(WmsInCostcenterBackItem::getLeft).reduce(BigDecimal.ZERO, BigDecimal::add).compareTo(BigDecimal.ZERO) > 0 ? 1 : 2)
+                .eq(WmsInCostcenterBack::getId, order.getId())
+                .update();
        inventoryService.in(records.stream()
                .collect(Collectors.groupingBy(InMaterialScanRecord::getKey))
                .values()
@ -262,7 +272,7 @@ public class InCostCenterBackController extends BaseController {
                                    .setResbRspos(item.getRspos())
                                    .setResbMatnr(item.getMatnr())
                                    .setMaktx(item.getMaktx())
-                                    .setResbLgort(order.getLgort())
+                                    .setResbLgort(request.getLgort())
                                    .setResbWerks(order.getWerks())
                                    .setResbMeins(item.getMeins())
                                    .setErfmg(its.stream().map(MaterialQRCodeContentDTO::getNum).reduce(BigDecimal.ZERO, BigDecimal::add))
@ -279,14 +289,6 @@ public class InCostCenterBackController extends BaseController {
        ticket.setDocYear(vo.getEMJahr());
        ticket.setMatDoc(vo.getEMblnr());
        inCostcenterBackTicketService.save(ticket);
-        inCostcenterBackService.lambdaUpdate()
-                .set(WmsInCostcenterBack::getSapStatus, true)
-                .set(WmsInCostcenterBack::getSapError, "")
-                .set(WmsInCostcenterBack::getUpdateBy, UserUtil.getUserName())
-                .set(WmsInCostcenterBack::getUpdateTime, LocalDateTime.now())
-                .set(WmsInCostcenterBack::getState, datas.stream().map(WmsInCostcenterBackItem::getLeft).reduce(BigDecimal.ZERO, BigDecimal::add).compareTo(BigDecimal.ZERO) > 0 ? 1 : 2)
-                .eq(WmsInCostcenterBack::getId, order.getId())
-                .update();
        return ApiResult.success();
    }

--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
@ -349,6 +349,8 @@ public class InProduceOrderController extends BaseController {
    public ApiResult<List<InProduceOrderItemVO>> getOrderInfo(@Valid @RequestParam @NotBlank String no) {
        WmsInProduceOrder order = produceOrderService.getByNo(no);
        VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
+        VUtil.trueThrowBusinessError(!Objects.equals(order.getState(), (short) 0))
+                .throwMessage("该订单非待收货状态");
        List<InProduceOrderItemVO> list = produceOrderItemService.getVOByOrderId(order.getId());
        if (order.getList()) {
            list = list.stream()
@ -395,6 +397,7 @@ public class InProduceOrderController extends BaseController {
        }
        List<String> materialNos = new ArrayList<>();
        List<InMaterialScanRecord> records = new ArrayList<>();
+        List<Zwm00Mb107QO> input1 = new ArrayList<>();
        list.forEach(it->{
            BigDecimal num = BigDecimal.ZERO;
            InProduceOrderReceiveMaterialQO materialQO = request.getItems().stream().filter(q -> StrUtil.equals(q.getMaterialNo(), it.getMaterialNo())).findFirst().orElse(null);
@ -419,6 +422,18 @@ public class InProduceOrderController extends BaseController {
                            .setCreateBy(UserUtil.getUserName())
                            .setCreateTime(Instant.now())
                    );
+                    Zwm00Mb107QO q = input1.stream().filter(ip -> StrUtil.equals(ip.getCHARG(), content.getBatchNo())).findFirst()
+                            .orElseGet(() -> {
+                                Zwm00Mb107QO qo = new Zwm00Mb107QO()
+                                        .setPWERK(it.getFactoryNo())
+                                        .setPSMNG(BigDecimal.ZERO)
+                                        .setAMEIN(it.getUnit())
+                                        .setLGORT(it.getWarehouseNo())
+                                        .setCHARG(content.getBatchNo());
+                                input1.add(qo);
+                                return qo;
+                            });
+                    q.setPSMNG(q.getPSMNG().add(content.getNum()));
                }
                if (num.compareTo(it.getNum()) != 0) {
                    materialNos.add(it.getMaterialNo());
@ -429,32 +444,22 @@ public class InProduceOrderController extends BaseController {
        });
        VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(materialNos))
                .throwMessage("以下物料的扫码数量与收货数量不一致:"+StrUtil.join(",", materialNos));
-        //同步入库信息到SAP
-        Zwm00Mb107DTO dto = sapService.zwm00_mb107(order.getOrderNo(), UserUtil.getUserName(), list.stream().map(it -> new Zwm00Mb107QO()
-                .setPWERK(it.getFactoryNo())
-                .setPSMNG(it.getNum())
-                .setAMEIN(it.getUnit())
-                .setLGORT(it.getWarehouseNo())
-                .setCHARG(it.getBatchNo())).toList(), null
+        inventoryService.in(input1.stream().map(it -> new InventoryDTO()
+                .setMaterialNo(request.getItems().get(0).getMaterialNo())
+                .setNum(it.getPSMNG())
+                .setFactoryNo(it.getPWERK())
+                .setWarehouseNo(it.getLGORT())
+                .setBatchNumber(it.getCHARG())).toList()
        );
-        produceOrderService.lambdaUpdate()
-                .set(WmsInProduceOrder::getMjahr, dto.getE_MJAHR())
-                .set(WmsInProduceOrder::getMblnr, dto.getE_MBLNR())
-                .eq(WmsInProduceOrder::getId, order.getId())
-                .update();
-
+        inMaterialScanRecordRespository.saveAll(records);
+        //同步入库信息到SAP
+        Zwm00Mb107DTO dto = sapService.zwm00_mb107(order.getOrderNo(), UserUtil.getUserName(), input1, null);
+        order.setMblnr(dto.getE_MBLNR());
+        order.setMjahr(dto.getE_MJAHR());
        order.setState((short)1);
        order.setUpdateBy(UserUtil.getUserName());
        order.setUpdateTime(LocalDateTime.now());
        produceOrderService.updateById(order);
-        inventoryService.in(list.stream().map(it-> new InventoryDTO()
-                .setMaterialNo(it.getMaterialNo())
-                .setNum(it.getNum())
-                .setFactoryNo(it.getFactoryNo())
-                .setWarehouseNo(it.getWarehouseNo())
-                .setBatchNumber(it.getBatchNo())).toList()
-        );
-        inMaterialScanRecordRespository.saveAll(records);
        return ApiResult.success();
    }

--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
@ -57,8 +57,6 @@ public class NormalPGIController extends BaseController {
    @Resource
    private NormalPGIControllerService normalPGIControllerService;

-    @Resource
-    private IWmsSrmMaterialReceiptItemService wmsSrmMaterialReceiptItemService;

    @Resource
    private SrmMaterialReceiptScanCodesRepository srmMaterialReceiptCanCodesRepository;
@ -259,7 +257,6 @@ public class NormalPGIController extends BaseController {
    @PostMapping("PDA/task/confirm")
    @ApiMark(moduleName = "送货单管理", apiName = "普通物料任务上架确认")
    public ApiResult<Void> takeDeliveryConfirm(@Valid @RequestBody PoReceiveTaskConfirmQO request) {
-
        //首先判断是否已经确认
        WmsPoReceipt wmsPoReceipt = wmsPoReceiptService.getById(request.getTaskId());
        VUtil.trueThrowBusinessError(Objects.isNull(wmsPoReceipt)).throwMessage("收货单不存在");
@ -277,7 +274,7 @@ public class NormalPGIController extends BaseController {
        List<StorageLocationDTO> storageLocationDTOS = new ArrayList<>();
        List<InventoryDTO> inventories = new ArrayList<>();
        List<ZWM3A17DTO> zwm3A17DTOS = new ArrayList<>();
-
+        List<SrmMaterialReceiptScanCodes> scanCodes = new ArrayList<>();
        for (WmsPoReceiptItem item : wmsPoReceiptItems) {
            PoReceiveTaskItemConfirmQO qo = request.getItems().stream()
                    .filter(q -> q.getId().equals(item.getId()))
@ -322,6 +319,11 @@ public class NormalPGIController extends BaseController {
            List<ZWM3A17Item2DTO> item2 = zwm3A17DTO.getItem2();

            List<SrmMaterialReceiptScanCodes> scanCode = srmMaterialReceiptScanCodesRepository.findByOrderItemId(item.getOrderItemId());
+            if (CollectionUtil.isNotEmpty(scanCode)) {
+                scanCode = scanCode.stream().filter(code -> code.getIsIntoStorage() == false)
+                        .toList();
+            }
+
            if (CollectionUtil.isNotEmpty(scanCode)) {
                scanCode.forEach(code -> {
                    // 库存
@ -371,6 +373,8 @@ public class NormalPGIController extends BaseController {
                            .setEBELP(item.getPoLineNumber())
                            .setFLAG("")
                            .setSERNR(code.getSerialNumbers()));
+
+                    scanCodes.add(code);
                });
            } else {
                // 库存
@ -394,7 +398,7 @@ public class NormalPGIController extends BaseController {
                );
            }
        }
-        normalPGIControllerService.takeDeliveryConfirm(receiptItems, storageLocationDTOS, inventories, zwm3A17DTOS, request.getTaskId());
+        normalPGIControllerService.takeDeliveryConfirm(receiptItems, storageLocationDTOS, inventories, zwm3A17DTOS, request.getTaskId(), scanCodes);
        return ApiResult.success();
    }

--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
+++ b/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()
                )
        );
    }
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ScanRecordController.java
+++ b/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 materialNo 物料编号
+     * @param trayItemId 托盘项id
     */
    @GetMapping("package")
-    public ApiResult<List<PackageMaterialScanRecord>> getScanRecord(@Valid @RequestParam @NotBlank String poNum
-            , @Valid @RequestParam @NotBlank String materialNo) {
-        return ApiResult.success(packageMaterialScanRecordRepository.findByPoNumAndMaterialNo(poNum, materialNo));
+    public ApiResult<List<PackageMaterialScanRecord>> getPackageScanRecord1(@Valid @RequestParam @NotNull Long trayItemId) {
+        return ApiResult.success(packageMaterialScanRecordRepository.findByTrayItemId(trayItemId));
+    }
+
+    /**
+     * 获取钢构包订单扫码记录
+     * @param poNum 采购订单号
+     * @param materialNo 钢构件物料编号
+     */
+    @GetMapping("package1")
+    public ApiResult<List<PackageMaterialScanRecord>> getPackageScanRecord2(String poNum, String materialNo) {
+        return ApiResult.success(packageMaterialScanRecordRepository.findByPoNumAndPackageNo(poNum, materialNo));
    }

    /**
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
+++ b/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,22 +128,24 @@ 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()
-                        .setIndex(IdUtil.getSnowflakeNextId())
-                        .setOrderNo(order.getEbeln())
-                        .setSupplierNo(request.getSupplierNo())
-                        .setSupplierName(supplier.getSupplierName())
-                        .setOrderRowNo(order.getEbelp())
-                        .setMaterialNo(order.getMatnr())
-                        .setMaterialDesc(order.getMaktx())
-                        .setPlanNum(order.getMenge())
-                        .setReceivedNum(order.getWemng())
-                        .setTransportNum(order.getTransportNum())
-                        .setLbprt(order.getLbprt())
-                        .setUnit(order.getMeins())
-                        .setKzkri(order.getKzkri())
+                .map(order -> {
+                            UserSupplier supplier = userSupplierService.getByCode(order.getLifnr());
+                            return new SAPOrderDTO()
+                                    .setIndex(IdUtil.getSnowflakeNextId())
+                                    .setOrderNo(order.getEbeln())
+                                    .setSupplierNo(order.getLifnr())
+                                    .setSupplierName(Objects.isNull(supplier) ? "" : supplier.getSupplierName())
+                                    .setOrderRowNo(order.getEbelp())
+                                    .setMaterialNo(order.getMatnr())
+                                    .setMaterialDesc(order.getMaktx())
+                                    .setPlanNum(order.getMenge())
+                                    .setReceivedNum(order.getWemng())
+                                    .setTransportNum(order.getTransportNum())
+                                    .setLbprt(order.getLbprt())
+                                    .setUnit(order.getMeins())
+                                    .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,10 +625,12 @@ public class StructuralPackageOrderController extends BaseController {
                .setCreateBy(UserUtil.getUserName())
                .setCreateTime(LocalDateTime.now());
        structuralPackageDeliverOrderService.save(deliverOrder);
-        structuralPackageDeliverOrderMapService.saveBatch(trays.stream().map(DeliverStructuralPackageOrderExtendVO::getTrayId).distinct().map(id ->
-                new WmsStructuralPackageDeliverOrderMap()
-                        .setDeliverId(deliverOrder.getId())
-                        .setOrderId(id)).toList());
+        structuralPackageDeliverOrderMapService.saveBatch(trays.stream()
+                .map(DeliverStructuralPackageOrderExtendVO::getId)
+                .distinct().map(id ->
+                        new WmsStructuralPackageDeliverOrderMap()
+                                .setDeliverId(deliverOrder.getId())
+                                .setOrderId(id)).toList());
        deliverStructuralPackageOrderTrayService.setStateByIds(ids, OrderState.InTransit);
        return ApiResult.success();
    }
@ -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();
    }
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/PackageMaterialScanRecord.java
+++ b/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
     */
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/SrmMaterialReceiptScanCodes.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/SrmMaterialReceiptScanCodes.java
@ -57,4 +57,9 @@ public class SrmMaterialReceiptScanCodes {
    public String getKey() {
        return this.batchNumber + ";" + this.serialNumbers;
    }
+
+    /**
+     * 是否在
+     */
+    private Boolean IsIntoStorage;
 }
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/SAPMaterialInfoInOrderDTO.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/SAPMaterialInfoInOrderDTO.java
@ -117,7 +117,4 @@ public class SAPMaterialInfoInOrderDTO {
     * 供应商账号
     */
    private String lifnr;
-
-
-
 }
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/PackageMaterialScanRecordRepository.java
+++ b/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);
 }
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/SrmMaterialReceiptScanCodesRepository.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/SrmMaterialReceiptScanCodesRepository.java
@ -2,6 +2,8 @@ package com.nflg.wms.admin.repository;

 import com.nflg.wms.admin.pojo.document.SrmMaterialReceiptScanCodes;
 import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.mongodb.repository.Query;
+import org.springframework.data.mongodb.repository.Update;
 import org.springframework.stereotype.Repository;

 import java.util.List;
@ -11,4 +13,10 @@ public interface SrmMaterialReceiptScanCodesRepository extends MongoRepository<S
    List<SrmMaterialReceiptScanCodes> findByOrderItemId(Long orderItemId);

    List<SrmMaterialReceiptScanCodes> findByCodeIdIn(List<String> attr0);
+
+@Query("{ 'codeId' : { $in : ?0 } }")
+@Update("{ $set : { 'isIntoStorage' : ?1 } }")
+void updateIsIntoStorage(List<String> codeIds, boolean isIntoStorage);
+
+
 }
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java
@ -32,6 +32,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;

 import static cn.dev33.satoken.SaManager.log;

@ -195,6 +196,7 @@ public class NormalPGIControllerService {
                            .setCodeNum(scanCode.getCodeNum())
                            .setBatchNumber(scanCode.getBatchNumber())
                            .setSerialNumbers(scanCode.getSerialNumbers())
+                            .setIsIntoStorage(false)
                            .setCodeContent(scanCode.getCodeContent()));
        }
        //查看是否有重复的条码
@ -276,7 +278,8 @@ public class NormalPGIControllerService {
            List<StorageLocationDTO> storageLocationDTOS,
            List<InventoryDTO> inventories,
            List<ZWM3A17DTO> zwm3A17DTOS,
-            Long taskId
+            Long taskId,
+            List<SrmMaterialReceiptScanCodes> scanCodes
    ) {
        if (CollectionUtil.isNotEmpty(wmsPoReceiptItems)) {
            wmsPoReceiptItemService.updateBatchById(wmsPoReceiptItems);
@ -317,6 +320,12 @@ public class NormalPGIControllerService {
                        .update();
            }
        }
+        //修改二维码的入库状态
+        if (CollectionUtil.isNotEmpty(scanCodes)) {
+            List<String> codeIds = scanCodes.stream().map(SrmMaterialReceiptScanCodes::getId).toList();
+               srmMaterialReceiptCanCodesRepository.updateIsIntoStorage(codeIds, true);
+        }
+
    }


--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java
@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.nflg.wms.admin.pojo.dto.QCReceiveDTO;
 import com.nflg.wms.common.pojo.vo.QCTaskItemScanCodesVO;
 import com.nflg.wms.common.pojo.vo.QCTaskItemVO;
+import com.nflg.wms.repository.entity.WmsQcReceive;
 import com.nflg.wms.repository.entity.WmsQcReceiveItem;
 import com.nflg.wms.repository.entity.WmsSrmQualityInspection;
 import com.nflg.wms.repository.service.IWmsInventoryService;
@ -106,6 +107,23 @@ public class NormalQMControllerService {
                qcReceiveDTO.getWaitModifyItems().forEach(item -> {
                    wmsQcReceiveItemService.updateInQty(item.getId(), item.getInQty(), item.getUnqualifiedQty(), item.getQualifiedQty());
                });
+                // 修改表头的状态
+                Long id = qcReceiveDTO.getWaitModifyItems().get(0).getId();
+                WmsQcReceiveItem wmsQcReceiveItem = wmsQcReceiveItemService.getById(id);
+                Long receiveId = wmsQcReceiveItem.getReceiveId();
+                List<Long> ids = wmsQcReceiveItemService.getUnReceivedItems(receiveId);
+//判断是否全部完成
+                if (CollectionUtil.isEmpty(ids)) {
+                    iWmsQcReceiveService.lambdaUpdate()
+                            .eq(WmsQcReceive::getId, receiveId)
+                            .set(WmsQcReceive::getIsCompleted, 2)
+                            .update();
+                } else {
+                    iWmsQcReceiveService.lambdaUpdate()
+                            .eq(WmsQcReceive::getId, receiveId)
+                            .set(WmsQcReceive::getIsCompleted, 1)
+                            .update();
+                }
            }
 // 上传SAP
            if (Objects.nonNull(qcReceiveDTO.getZwm3a18DTO())) {
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java
+++ b/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");
-        log.info("sreturn:" + sreturn);
-        VUtil.trueThrowBusinessError(!StrUtil.equals(sreturn.getString("TYPE"), "S"))
-                .throwMessage("SAP错误:" + sreturn.getString("MESSAGE"));
+        JCoStructure eReturn = function.getExportParameterList().getStructure("E_RETURN");
+        print("E_RETURN", eReturn);
+        JCoStructure eOutput = function.getExportParameterList().getStructure("E_OUTPUT");
+        print("E_OUTPUT", eOutput);

-        JCoStructure structure = function.getExportParameterList().getStructure("E_OUTPUT");
-        return JCoUtil.toBean(structure, ZWM00MB007DTO.class);
+        ZWM00MB007DTO dto = JCoUtil.toBean(eOutput, 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;
+        }
    }

    /**
@ -113,6 +119,7 @@ public class SapService {
        JCoFunction function = exec("ZWM00_MB107", parameters, tables);

        JCoParameterList pl = function.getExportParameterList();
+        log.info("E_MBLNR:{}", pl.getString("E_MBLNR"));
        VUtil.trueThrowBusinessError(StrUtil.isBlank(pl.getString("E_MBLNR")))
                .throwMessage("SAP错误");
        VUtil.trueHandle(StrUtil.isBlank(pl.getString("E_MBLNR"))).trueHandle(() -> {
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java
@ -420,32 +420,22 @@ 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())
-                            .setFactoryNo(it.getFactory())
-                            .setWarehouseNo(it.getReceivedWarehouse())
-                            .setNum(it.getInspectionQty()))
-                    .toList()
-            );
-            Pair<Pair<String, String>, Pair<String, String>> pair = syncInToSAP(list);
-            list.forEach(it -> {
-                it.setMatDoc101(pair.getKey().getKey());
-                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);
-        } catch (Exception ex) {
-            saveSapError(list, ex.getMessage());
-        }
+        inventoryService.in(list.stream().map(it -> new InventoryDTO()
+                        .setMaterialNo(it.getItemCode())
+                        .setBatchNumber(it.getBatchNumber())
+                        .setFactoryNo(it.getFactory())
+                        .setWarehouseNo(it.getReceivedWarehouse())
+                        .setNum(it.getInspectionQty()))
+                .toList()
+        );
+        Pair<Pair<String, String>, Pair<String, String>> pair = syncInToSAP(list);
+        list.forEach(it -> {
+            it.setMatDoc101(pair.getKey().getKey());
+            it.setDocYear101(pair.getKey().getValue());
+            it.setMatDoc103(pair.getValue().getKey());
+            it.setDocYear103(pair.getValue().getValue());
+        });
+        inTaskItemService.updateBatchById(list);
    }

    @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())
--- a/nflg-wms-admin/src/main/resources/application-sit.yml
+++ b/nflg-wms-admin/src/main/resources/application-sit.yml
@ -1,4 +1,6 @@
 logging:
+  loki:
+    url: http://192.168.163.83:3100/loki/api/v1/push
  level:
    root: info
    com:
--- a/nflg-wms-admin/src/main/resources/logback-spring.xml
+++ b/nflg-wms-admin/src/main/resources/logback-spring.xml
@ -5,6 +5,7 @@

    <Property name="logDir" value="./logs" />

+    <springProperty scope="context" name="LOKI_URL" source="logging.loki.url" defaultValue=""/>
    <springProperty scope="context" name="appName" source="spring.application.name" defaultValue="admin"/>
    <springProperty scope="context" name="profile" source="spring.profiles.active" defaultValue="dev"/>
    <define name="HOSTIP" class="com.nflg.wms.starter.definer.HostIpDefiner"/>
@ -51,7 +52,7 @@

    <appender name="LOKI" class="com.github.loki4j.logback.Loki4jAppender">
        <http>
-            <url>http://192.168.163.83:3100/loki/api/v1/push</url>
+            <url>${LOKI_URL}</url>
        </http>
        <labels>
            service_name = wms
--- a/nflg-wms-admin/src/main/resources/template/成本中心退料单.html
+++ b/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>
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/StructuralPackageMaterialQRCodeContentDTO.java
+++ b/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;
+
    /**
     * 数量
     */
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM00MB007DTO.java
+++ b/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;
 }
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ConfigAddQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ConfigAddQO.java
@ -11,7 +11,6 @@ public class ConfigAddQO {
    /**
     * 所属组别
     */
-    @NotBlank
    private String groupName;

    //名称
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InCostcenterBackSubmitItemQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InCostcenterBackSubmitItemQO.java
@ -19,7 +19,7 @@ public class InCostcenterBackSubmitItemQO {
     * 实际入库储位编号列表
     */
    @NotEmpty
-    private List<String> lgpbe;
+    private List<String> binNos;

    /**
     * 二维码列表
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialStorageItemQO.java
+++ b/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;
 }
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageDeliverOrderSaveItemQO.java
+++ b/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;
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QCReceiveTaskConfirmQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QCReceiveTaskConfirmQO.java
@ -48,5 +48,5 @@ public class QCReceiveTaskConfirmQO {
    /**
     * 质检单ID
     */
-    private List<Long> QcIdList;
+    private List<Long> qcIdList;
 }
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SearchSAPOrderQO.java
+++ b/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;

    /**
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java
+++ b/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;

    /**
     * 托盘数量
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderTrayItemSimpleVO.java
+++ b/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;
 }
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderTrayVO.java
+++ b/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;
 }
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceOrderMaterialVO.java
+++ b/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;

    /**
     * 数量
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiptVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiptVO.java
@ -59,9 +59,9 @@ public class QCReceiptVO {
    private String supplierName;

    /**
-     * 是否已入库，true 是；false 否
+     * 是否已入库，0 未完成，1 部分入库，2 已完成
     */
-    private Boolean isCompleted;
+    private Integer isCompleted;
    /**
     * 收货时间
     */
@ -74,5 +74,5 @@ public class QCReceiptVO {
    /**
     * 是否已开检
     */
-    private  Boolean isCheck;
+    private Boolean isCheck;
 }
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayItemVO.java
+++ b/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 = "点击查看";
 }
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInTaskItem.java
+++ b/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;
 }
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsQcReceiveItemMapper.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsQcReceiveItemMapper.java
@ -22,4 +22,6 @@ public interface WmsQcReceiveItemMapper extends BaseMapper<WmsQcReceiveItem> {
    void updateCheckNum(BigDecimal InspectionQty, String noteNum, String lineNumber, String itemCode, String  materialDoc);

    void updateInQty(Long id, BigDecimal inQty, BigDecimal unqualifiedQty, BigDecimal qualifiedQty);
+
+    List<Long> getUnReceivedItems(Long receiveId);
 }
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsQcReceiveItemService.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsQcReceiveItemService.java
@ -24,4 +24,6 @@ public interface IWmsQcReceiveItemService extends IService<WmsQcReceiveItem> {
    void updateCheckNum(BigDecimal InspectionQty, String noteNum, String lineNumber, String itemCode,String materialDoc);

    void updateInQty(Long id, BigDecimal inQty,BigDecimal unqualifiedQty,BigDecimal qualifiedQty);
+
+    List<Long> getUnReceivedItems(Long receiveId);
 }
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java
@ -81,7 +81,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                .setSourceId(request.getNo());


-//        Department dept2 = BeanUtil.copy(dept1, Department.class);
+        //Department dept2 = BeanUtil.copy(dept1, Department.class);
 //        dept2.setName(request.getName())
 //                .setParentId(request.getParentId())
 //                .setUpdateBy(UserUtil.getUserName())
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInTaskServiceImpl.java
+++ b/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 {
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsQcReceiveItemServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsQcReceiveItemServiceImpl.java
@ -35,4 +35,9 @@ public class WmsQcReceiveItemServiceImpl extends ServiceImpl<WmsQcReceiveItemMap
    public void updateInQty(Long id, BigDecimal inQty, BigDecimal unqualifiedQty, BigDecimal qualifiedQty) {
        baseMapper.updateInQty(id, inQty, unqualifiedQty, qualifiedQty);
    }
+
+    @Override
+    public List<Long> getUnReceivedItems(Long receiveId) {
+        return baseMapper.getUnReceivedItems(receiveId);
+    }
 }
--- a/nflg-wms-repository/src/main/resources/mapper/WmsInTaskItemMapper.xml
+++ b/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>
--- a/nflg-wms-repository/src/main/resources/mapper/WmsInTaskMapper.xml
+++ b/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!=''">
-            AND task_number like CONCAT('%', #{request.no}, '%')
+        <if test="no != null and 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>
--- a/nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveItemMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveItemMapper.xml
@ -1,7 +1,6 @@
 <?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.WmsQcReceiveItemMapper">
-
    <select id="getTaskItem" resultType="com.nflg.wms.common.pojo.vo.QCTaskItemVO">
        select id,
               line_number,
@ -37,4 +36,11 @@
          and material_doc = #{materialDoc}
          and item_code = #{ itemCode}
    </update>
+
+    <select id="getUnReceivedItems" resultType="java.lang.Long">
+        select id
+        from wms_qc_receive_item
+        where receive_id = #{receiveId}
+          and receipt_num > in_qty
+    </select>
 </mapper>
--- a/nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml
+++ b/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 and is_check = true
+        where is_completed !=2  and is_check = true
        <if test="orderNo != null and orderNo != ''">
            and ( in_no like concat( '%',#{orderNo},'%') or order_no like concat( '%',#{orderNo},'%') )
        </if>
@ -31,7 +31,8 @@
        a.create_time as receive_time,
        a.update_time as in_time,
        a.create_user_name as receive_user_name,
-        a.update_user_name as in_user_name
+        a.update_user_name as in_user_name,
+        a.is_check
        from wms_qc_receive a
        left join
        wms_srm_order b on a.order_no = b.note_num
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml
@ -32,6 +32,7 @@
                and pdo.create_time &lt;= #{request.endDate}
            </if>
        </where>
+        order by pdo.id desc
    </select>

    <select id="getIdsByExternalOrderNo" resultType="java.lang.Long">
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml
+++ b/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
--- a/nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyMapper.xml
+++ b/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>
--- a/nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyTicketItemMapper.xml
+++ b/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>
--- a/nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyTicketMapper.xml
+++ b/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">
--- a/nflg-wms-repository/src/main/resources/mapper/WmsTransferFactoryMapper.xml
+++ b/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>
--- a/nflg-wms-repository/src/main/resources/mapper/WmsTransferFactoryTicketItemMapper.xml
+++ b/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>
--- a/nflg-wms-repository/src/main/resources/mapper/WmsTransferFactoryTicketMapper.xml
+++ b/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">
--- a/nflg-wms-starter/src/main/java/com/nflg/wms/starter/config/AliyunOSSConfig.java
+++ b/nflg-wms-starter/src/main/java/com/nflg/wms/starter/config/AliyunOSSConfig.java
@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;

@Configuration
@ConditionalOnProperty(name = "file.upload.type", havingValue = "oss")
@ -31,6 +32,7 @@ public class AliyunOSSConfig {
    //private OSS ossClient;

    @Bean(destroyMethod = "shutdown")
+    @Lazy
    public OSS ossClient() {
        log.info("初始化阿里云OSS服务");
        ClientConfiguration config = new ClientConfiguration();
--- a/nflg-wms-starter/src/main/java/com/nflg/wms/starter/config/MinIOConfig.java
+++ b/nflg-wms-starter/src/main/java/com/nflg/wms/starter/config/MinIOConfig.java
@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;

@Slf4j
@Configuration
@ -31,6 +32,7 @@ public class MinIOConfig {
    private MinioClient client;

    @Bean
+    @Lazy
    public MinioClient initMinioClient() throws Exception{
        client= MinioClient.builder()
                .endpoint(endpoint)
--- a/nflg-wms-starter/src/main/java/com/nflg/wms/starter/config/RedisConfig.java
+++ b/nflg-wms-starter/src/main/java/com/nflg/wms/starter/config/RedisConfig.java
@ -2,6 +2,7 @@ package com.nflg.wms.starter.config;

 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
@ -11,6 +12,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 public class RedisConfig {

    @Bean
+    @Lazy
    public RedisTemplate<String, Object> redisObjectTemplate(RedisConnectionFactory redisConnectionFactory) {
        RedisTemplate<String, Object> template = new RedisTemplate<>();
        template.setConnectionFactory(redisConnectionFactory);
@ -27,6 +29,7 @@ public class RedisConfig {
    }

    @Bean
+    @Lazy
    public RedisTemplate<String, String> redisStringTemplate(RedisConnectionFactory redisConnectionFactory) {
        RedisTemplate<String, String> template = new RedisTemplate<>();
        template.setConnectionFactory(redisConnectionFactory);
Author	SHA1	Message	Date
zhangke	d40773b593	接收质检物料的接口调整	2025-09-08 11:51:34 +08:00
zhangke	98640065fe	Merge remote-tracking branch 'origin/develop' into dev_zhangke	2025-09-08 10:32:33 +08:00
曹鹏飞	f3bc54aa94	一些优化	2025-09-07 16:43:17 +08:00
曹鹏飞	43454304dd	一些优化	2025-09-05 18:57:17 +08:00