From dc60b3451a2984722c01a5991e5b904b8bd44f0d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 21:30:33 +0800
Subject: [PATCH] 组绑解绑

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java |  256 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 151 insertions(+), 105 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 05870a3..a81605c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -8,22 +8,17 @@
 import com.vincent.rsf.framework.exception.CoolException;
 import com.vincent.rsf.server.api.controller.params.*;
 import com.vincent.rsf.server.api.entity.dto.*;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.enums.OrderWorkType;
+import com.vincent.rsf.server.manager.enums.*;
 import com.vincent.rsf.server.api.service.MobileService;
 import com.vincent.rsf.server.common.config.ConfigProperties;
 import com.vincent.rsf.server.common.enums.WarehouseAreaType;
 import com.vincent.rsf.server.common.security.JwtSubject;
-import com.vincent.rsf.server.common.utils.CommonUtil;
 import com.vincent.rsf.server.common.utils.FieldsUtils;
 import com.vincent.rsf.server.common.utils.JwtUtil;
 import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
 import com.vincent.rsf.server.manager.controller.params.IsptItemsParams;
 import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
 import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.AsnExceStatus;
-import com.vincent.rsf.server.manager.enums.PakinIOStatus;
-import com.vincent.rsf.server.manager.enums.QlyIsptStatus;
 import com.vincent.rsf.server.manager.mapper.*;
 import com.vincent.rsf.server.manager.service.*;
 import com.vincent.rsf.server.system.constant.CodeRes;
@@ -37,7 +32,6 @@
 import com.vincent.rsf.server.system.service.UserLoginService;
 import com.vincent.rsf.server.system.service.UserService;
 import com.vincent.rsf.server.system.utils.SerialRuleUtils;
-import org.apache.commons.codec.digest.Md5Crypt;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,8 +41,6 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -217,7 +209,6 @@
         }
 
         List<ReceiptDetlsDto> receipts = receiptParam.getReceipts();
-        List<WarehouseAreasItem> allOrders = new ArrayList<>();
 
         Double receiptQty = receipts.stream().mapToDouble(ReceiptDetlsDto::getReceiptQty).sum();
 
@@ -255,10 +246,15 @@
 //            if (dto.getReceiptQty().compareTo(dto.getAnfme()) > 0) {
 //                throw new CoolException("鏀惰揣鏁伴噺涓嶈兘澶т簬閲囪喘鏁伴噺锛侊紒");
 //            }
-            AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>()
-                    .eq(AsnOrderItem::getAsnCode, asnCode)
-                    .eq(AsnOrderItem::getTrackCode, dto.getBarcode())
-                    .eq(AsnOrderItem::getMatnrId, dto.getMatnrId()));
+//            AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>()
+//                    .eq(AsnOrderItem::getAsnCode, asnCode)
+//                    .eq(AsnOrderItem::getId, dto.getId())
+//                    .eq(AsnOrderItem::getTrackCode, dto.getBarcode())
+//                    .eq(AsnOrderItem::getSplrBatch, dto.getSplrBatch()));
+
+            AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, dto.getId()));
+            //asnOrderItemMapper.resultById(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, dto.getId()));
+
             if (Objects.isNull(orderItem)) {
                 throw new CoolException("閫氱煡鍗曟槑缁嗕笉瀛樺湪锛侊紒");
             }
@@ -267,7 +263,7 @@
             }
             Double itemRcptQty = dto.getReceiptQty() + orderItem.getQty();
             orderItem.setQty(itemRcptQty)
-                    .setSplrBatch(dto.getSplrBatch())
+//                    .setSplrBatch(dto.getSplrBatch())
                     .setUpdateBy(loginUserId)
                     .setStockUnit(dto.getStockUnit())
                     .setProdTime(dto.getProdTime());
@@ -276,7 +272,8 @@
                 try {
                     if (Objects.isNull(rcpt.get("fieldsindex")) || StringUtils.isBlank(rcpt.get("fieldsindex").toString())) {
                         //鑾峰彇16浣島uid
-                        String uuid16 = Cools.md5(dto.getBarcode());
+//                        String uuid16 = Cools.md5(dto.getBarcode());
+                        String uuid16 = Cools.md5(dto.getId() + dto.getMatnr());
                         rcpt.put("index", uuid16);
                         orderItem.setFieldsIndex(uuid16);
                     }
@@ -290,75 +287,84 @@
             if (asnOrderItemMapper.updateById(orderItem) < 1) {
                 throw new CoolException("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�");
             }
+            /**淇濆瓨鏄庣粏鑷虫敹璐у尯**/
+            extracted(loginUserId, dto, areasItem, orderItem, asnOrder, matnr);
 
-            WarehouseAreasItem item = new WarehouseAreasItem();
-//            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//            String format = null;
-//            if (Objects.isNull(dto.getProdTime())) {
-//                 format = dateFormat.format(dto.getProdTime());
-//            }
-            item.setTrackCode(dto.getBarcode())
-                    .setAreaName(areasItem.getName())
-                    .setAreaId(areasItem.getId())
-                    .setAsnItemId(orderItem.getId())
-                    .setAsnCode(asnOrder.getCode())
-                    .setAsnId(asnOrder.getId())
-                    .setProdTime(dto.getProdTime())
-                    .setWeight(dto.getWeigth())
-                    //搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
-                    .setUnit(orderItem.getStockUnit())
-                    .setStockUnit(orderItem.getStockUnit())
-                    .setBatch(StringUtils.isBlank(orderItem.getBatch()) ? SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto) : orderItem.getBatch())
-                    .setAnfme(dto.getReceiptQty())
-                    .setSplrBatch(dto.getSplrBatch())
-                    .setMatnrCode(matnr.getCode())
-                    .setUpdateBy(loginUserId)
-                    .setCreateBy(loginUserId)
-                    .setMatnrId(matnr.getId())
-                    .setMaktx(matnr.getName())
-                    .setWeight(matnr.getWeight())
-                    .setFieldsIndex(orderItem.getFieldsIndex())
-                    .setShipperId(matnr.getShipperId());
-            //TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲
-
-            WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
-                    .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
-                    .eq(WarehouseAreasItem::getTrackCode, item.getTrackCode())
-                    .eq(StringUtils.isNotBlank(item.getSplrBatch()), WarehouseAreasItem::getSplrBatch, item.getSplrBatch()));
-            if (!Objects.isNull(serviceOne)) {
-                item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
-                item.setId(serviceOne.getId());
-            }
-
-            if (!warehouseAreasItemService.saveOrUpdate(item)) {
-                throw new CoolException("鏀惰揣澶辫触锛侊紒");
-            }
         }
-//        if (!warehouseAreasItemService.saveBatch(allOrders)) {
-//            throw new CoolException("鏀惰揣澶辫触锛侊紒");
-//        }
 
         AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, asnCode));
         if (order.getQty().compareTo(order.getAnfme()) >= 0.00) {
-            order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val).setRleStatus(Short.valueOf("1"));
-
+            order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val).setRleStatus(Short.valueOf("1"));
             if (!asnOrderMapper.updateById(order)) {
                 throw new CoolException("璁㈠崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
             }
         }
 
+        return R.ok("鏀惰揣鎴愬姛锛侊紒");
+    }
 
-        //鑾峰彇閲囪喘鏁伴噺
-//        double purQty = receipts.stream().mapToDouble(ReceiptDetlsDto::getPurQty).sum();
+    private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, AsnOrderItem orderItem, AsnOrder asnOrder, Matnr matnr) {
+        WarehouseAreasItem item = new WarehouseAreasItem();
+        item.setTrackCode(dto.getBarcode())
+                .setAreaName(areasItem.getName())
+                .setAreaId(areasItem.getId())
+                .setAsnItemId(orderItem.getId())
+                .setAsnCode(asnOrder.getCode())
+                .setAsnId(asnOrder.getId())
+                .setProdTime(dto.getProdTime())
+                .setWeight(dto.getWeigth())
+                //搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
+                .setUnit(orderItem.getStockUnit())
+                .setStockUnit(orderItem.getStockUnit())
+                .setBatch(StringUtils.isBlank(orderItem.getBatch()) ? SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto) : orderItem.getBatch())
+                .setAnfme(dto.getReceiptQty())
+                .setSplrBatch(dto.getSplrBatch())
+                .setMatnrCode(matnr.getCode())
+                .setUpdateBy(loginUserId)
+                .setCreateBy(loginUserId)
+                .setMatnrId(matnr.getId())
+                .setIsptResult(orderItem.getIsptResult())
+                .setMaktx(matnr.getName())
+                .setWeight(matnr.getWeight())
+                .setFieldsIndex(orderItem.getFieldsIndex())
+                .setShipperId(matnr.getShipperId());
+        //TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲
+        WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
+//                .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
+                .eq(WarehouseAreasItem::getMatnrCode, item.getMatnrCode())
+                .eq(!Cools.isEmpty(item.getFieldsIndex()), WarehouseAreasItem::getFieldsIndex, item.getFieldsIndex())
+                .eq(WarehouseAreasItem::getAsnCode, item.getAsnCode())
+                .eq(!Cools.isEmpty(item.getIsptResult()), WarehouseAreasItem::getIsptResult, item.getIsptResult())
+                .eq(StringUtils.isNotBlank(item.getSplrBatch()), WarehouseAreasItem::getSplrBatch, item.getSplrBatch()));
+        if (!Objects.isNull(serviceOne)) {
+            item.setId(serviceOne.getId());
+            item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
+        }
 
-//        BigDecimal subtract = BigDecimal.valueOf(receiptQty).subtract(BigDecimal.valueOf(purQty));
-//        //鍒ゆ柇宸叉敹璐ф暟閲忔槸鍚﹀皬浜庣瓑浜庨噰璐暟閲�
-//        if (subtract.compareTo(new BigDecimal("0.0")) <= 0) {
-//            asnOrder.setRleStatus(Short.valueOf("1"));
-//            //鏃ュ織琛ㄦ搷浣�
-//            operateOrderLogs(asnOrder);
+        //鏈川妫�
+        if (!warehouseAreasItemService.saveOrUpdate(item)) {
+            throw new CoolException("鏀惰揣澶辫触锛侊紒");
+        }
+
+//        if (null != orderItem.getSafeQty() || null != orderItem.getDisQty() ) {
+//
 //        }
-        return R.ok(asnOrder);
+//        else {
+//            //涓嶅悎鏍兼暟閲�
+//            if (orderItem.getDisQty().compareTo(0.00) > 0) {
+//                item.setIsptQty(orderItem.getDisQty()).setFlagNorm(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val);
+//                if (!warehouseAreasItemService.saveOrUpdate(item)) {
+//                    throw new CoolException("鏀惰揣澶辫触锛侊紒");
+//                }
+//            }
+//
+//            item.setIsptQty(orderItem.getSafeQty()).setFlagNorm(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val);
+//            if (!warehouseAreasItemService.saveOrUpdate(item)) {
+//                throw new CoolException("鏀惰揣澶辫触锛侊紒");
+//            }
+//        }
+
+
     }
 
     /**
@@ -374,7 +380,9 @@
         }
         List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
                 .eq(AsnOrderItem::getAsnCode, params.getAsnCode())
-                .eq(!Objects.isNull(params.getTrackCode()), AsnOrderItem::getTrackCode, params.getTrackCode()));
+                .eq(!Objects.isNull(params.getTrackCode()), AsnOrderItem::getTrackCode, params.getTrackCode())
+                .eq(!Cools.isEmpty(params.getMatnrCode()), AsnOrderItem::getMatnrCode, params.getMatnrCode())
+        );
 
         if (Objects.isNull(asnOrderItem)) {
             throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
@@ -412,7 +420,8 @@
      */
     @Override
     public R getReceiptAreas() {
-        List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type));
+        List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
+                .eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type));
         return R.ok(areas);
     }
 
@@ -436,13 +445,21 @@
      * @time 2025/4/7 16:58
      */
     @Override
-    public R getDeltByCode(String code) {
+    public R getDeltByCode(Map<String, Object> params) {
+        Object code = params.get("code");
+        Object matnrCode = params.get("matnrCode");
+        Object asnCode = params.get("asnCode");
+        Object batch = params.get("batch");
+
         //TODO 鍚庣画闇�鏍规嵁绛栫暐閰嶇疆锛岃幏鍙栫粍鎷栨暟鎹�傚锛氭贩瑁咃紝鎸夋壒娆℃贩瑁呯瓑
-        LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()
-                .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch,unit, stock_unit,  qty, work_qty, matnr_code, matnr_id, maktx").lambda()
-                .eq(WarehouseAreasItem::getTrackCode, code)
-                .groupBy(WarehouseAreasItem::getSplrBatch, WarehouseAreasItem::getAsnId, WarehouseAreasItem::getAreaId, WarehouseAreasItem::getMatnrId);
-        return R.ok(warehouseAreasItemService.getOne(queryWrapper));
+        LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
+                .eq(!Cools.isEmpty(code), WarehouseAreasItem::getTrackCode, code)
+                .eq(!Cools.isEmpty(batch), WarehouseAreasItem::getSplrBatch, batch)
+                .eq(!Cools.isEmpty(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode)
+                .eq(!Cools.isEmpty(asnCode), WarehouseAreasItem::getAsnCode, asnCode);
+        List<WarehouseAreasItem> list = warehouseAreasItemService.list(queryWrapper);
+        list.removeIf(e -> e.getAnfme() <= e.getWorkQty());
+        return R.ok(list);
     }
 
     /**
@@ -683,6 +700,8 @@
         stock.setAnfme(sum)
                 .setSourceId(order.getId())
                 .setType(order.getType())
+                .setUpdateBy(loginUserId)
+                .setCreateBy(loginUserId)
                 .setWkType(Short.parseShort(order.getWkType()));
         if (!stockService.save(stock)) {
             throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
@@ -701,6 +720,8 @@
                     .setId(null)
                     .setLocCode(loc.getCode())
                     .setOrderId(order.getId())
+                    .setUpdateBy(loginUserId)
+                    .setUpdateBy(loginUserId)
                     .setOrderItemId(asnOrderItem.getId())
                     .setWkType(Short.parseShort(order.getWkType()))
                     .setType(order.getType());
@@ -818,6 +839,9 @@
      */
     @Override
     public R getItemByContainer(Map<String, Object> params) {
+//        if (Objects.isNull(params.get("code"))) {
+//            throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+//        }
         //鑾峰彇缁勬嫋鏈敓鎴愪换鍔$殑缁勬嫋妗�
         List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
         Short flagDefect = 0;
@@ -826,8 +850,33 @@
         }
         WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
                 .eq(WaitPakin::getBarcode, params.get("barcode").toString())
-                .eq(WaitPakin::getFlagDefect, flagDefect)
+//                .eq(WaitPakin::getFlagDefect, flagDefect)
                 .in(WaitPakin::getIoStatus, asList));
+        if (Cools.isEmpty(waitPakin)) {
+            throw new CoolException("鎵樼洏鍙敤");
+        } else {
+            throw new CoolException("鎵樼洏涓嶅彲鐢�");
+        }
+    }
+
+    /**
+     * @param
+     * @return
+     * @author Ryan
+     * @description 閫氳繃瀹瑰櫒鑾峰彇缁勬嫋鐗╂枡
+     * @time 2025/4/9 16:57
+     */
+    @Override
+    public R getUnItemByContainer(Map<String, Object> params) {
+        if (Objects.isNull(params.get("barcode"))) {
+            throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        //鑾峰彇缁勬嫋鏈敓鎴愪换鍔$殑缁勬嫋妗�
+//        List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
+
+        WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
+                .eq(WaitPakin::getBarcode, params.get("barcode").toString())
+                .eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
         if (Objects.isNull(waitPakin)) {
             return R.ok(new ArrayList<>());
         }
@@ -836,27 +885,19 @@
         if (pakinItems.isEmpty()) {
             return R.ok(new ArrayList<>());
         }
-        if (!Objects.isNull(params.get("type")) && params.get("type").equals("defective")) {
-            return R.ok(pakinItems);
-        } else {
-            List<String> list = pakinItems.stream().map(WaitPakinItem::getTrackCode).collect(Collectors.toList());
-            LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()
-                    .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch, qty, work_qty, matnr_code, matnr_id, maktx")
-                    .lambda()
-                    .in(WarehouseAreasItem::getTrackCode, list)
-                    .groupBy(WarehouseAreasItem::getSplrBatch,
-                            WarehouseAreasItem::getTrackCode);
-            List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
-            for (int i = 0; i < warehouseAreasItems.size(); i++) {
-                for (WaitPakinItem pakinItem : pakinItems) {
-                    if (warehouseAreasItems.get(i).getTrackCode().equals(pakinItem.getTrackCode())) {
-                        warehouseAreasItems.get(i).setAnfme(pakinItem.getAnfme());
-                    }
+        List<Long> list = pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toList());
+        LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>().in(WarehouseAreasItem::getId, list);
+        List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
+        for (int i = 0; i < warehouseAreasItems.size(); i++) {
+            for (WaitPakinItem pakinItem : pakinItems) {
+                if (warehouseAreasItems.get(i).getId().equals(pakinItem.getSource())) {
+                    warehouseAreasItems.get(i).setAnfme(pakinItem.getAnfme());
                 }
             }
-            return R.ok(warehouseAreasItems);
         }
+        return R.ok(warehouseAreasItems);
     }
+
 
     /**
      * @param
@@ -945,6 +986,7 @@
             ReceiptDetlsDto detlsDto = new ReceiptDetlsDto();
 
             detlsDto.setAsnCode(asnOrderItem.getAsnCode())
+                    .setId(asnOrderItem.getId())
                     .setMaktx(asnOrderItem.getMaktx())
                     .setFieldsIndex(asnOrderItem.getFieldsIndex())
                     .setBarcode(asnOrderItem.getTrackCode())
@@ -954,7 +996,11 @@
                     .setPoCode(asnOrderItem.getPoCode())
                     .setAnfme(asnOrderItem.getAnfme())
                     .setPurQty(asnOrderItem.getPurQty())
-                    .setSplrBatch(asnOrderItem.getSplrBatch());
+                    .setSplrBatch(asnOrderItem.getSplrBatch())
+                    .setMatnr(asnOrderItem.getMatnrCode())
+                    .setInspect(asnOrderItem.getIsptResult$()) //璐ㄦ缁撴灉
+                    .setPlatItemId(asnOrderItem.getPlatItemId())
+            ;
 
             Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId());
             if (Objects.isNull(matnr)) {
@@ -963,12 +1009,12 @@
             //SET 鐗╂枡鏈�澶у瓨鏀炬暟閲�
             detlsDto.setMaxQty(matnr.getMaxQty())
                     .setMatnrId(matnr.getId());
-            QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
-                    .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
-            if (!Objects.isNull(inspect)) {
-                //set 璐ㄦ缁撴灉
-                detlsDto.setInspect(inspect.getStatus$());
-            }
+//            QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
+//                    .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
+//            if (!Objects.isNull(inspect)) {
+//                //set 璐ㄦ缁撴灉
+//                detlsDto.setInspect(inspect.getStatus$());
+//            }
             //鑾峰彇褰撳墠搴撳瓨淇℃伅
             LocItem stockItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
 //                    .eq(LocItem::getOrderItemId, asnOrderItem.getId())

--
Gitblit v1.9.1