From f6e17ebcf5e66b590391e13595968b7e05a7f966 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 28 十月 2025 19:08:22 +0800
Subject: [PATCH] *待判接口开发

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   74 ++++++++++++++++++++++++++++++------
 1 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 4a2b123..3ea06d8 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -599,9 +599,10 @@
         WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
         if (Cools.isEmpty(wrkMast)){
             throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔′笉瀛樺湪,浠诲姟鍙凤細"+basDevp.getWrkNo());
-        }else if (!wrkMast.getWrkSts().equals(52L)){
-            throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔＄姸鎬佸凡鍙樻洿锛岃鍕块噸澶嶇敵璇�,浠诲姟鍙凤細"+basDevp.getWrkNo()+",浠诲姟鐘舵��:"+wrkMast.getWrkSts$());
         }
+//        else if (!wrkMast.getWrkSts().equals(52L)){
+//            throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔＄姸鎬佸凡鍙樻洿锛岃鍕块噸澶嶇敵璇�,浠诲姟鍙凤細"+basDevp.getWrkNo()+",浠诲姟鐘舵��:"+wrkMast.getWrkSts$());
+//        }
 
         List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", basDevp.getWrkNo()));
         if (Cools.isEmpty(wrkDetls) || wrkDetls.size()==0){
@@ -633,10 +634,10 @@
 //        labellerMatParam.setLabellingTime(DateUtils.convert(new Date()));
 //        labellerMatParam.setLabTemplate("1");
 //        labellerMatParam.setOrderNo(orderNo);
-        wrkMast.setWrkSts(53L);
-        if (!wrkMastService.updateById(wrkMast)){
-            throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
-        }
+//        wrkMast.setWrkSts(53L);
+//        if (!wrkMastService.updateById(wrkMast)){
+//            throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
+//        }
         return labellerMatParam;
     }
 
@@ -780,14 +781,20 @@
             throw new CoolException("鎵樼洏鏉＄爜锛�"+param.getBarcode()+"宸插瓨鍦紝璇峰嬁閲嶅缁勬墭");
         }
 
-        int rgvOneType = rgvOneSignService.selectCount(new EntityWrapper<RgvOneSign>().eq("rgv_one_type", param.getPalletizingNo() + "barcode" + param.getBarcode()));
-        if (rgvOneType==0){
-            RgvOneSign rgvOneSign = new RgvOneSign();
-            rgvOneSign.setRgvOneSign(param.getPalletizingNo());
-            rgvOneSign.setRgvOneType(param.getPalletizingNo() + "barcode" + param.getBarcode());
-            rgvOneSignService.insert(rgvOneSign);
+        try{
+            int rgvOneType = rgvOneSignService.selectCount(new EntityWrapper<RgvOneSign>().eq("rgv_one_type", param.getPalletizingNo() + "barcode" + param.getBarcode()));
+            if (rgvOneType==0){
+                RgvOneSign rgvOneSign = new RgvOneSign();
+                rgvOneSign.setRgvOneSign(param.getPalletizingNo());
+                rgvOneSign.setRgvOneType(param.getPalletizingNo() + "barcode" + param.getBarcode());
+                boolean insert = rgvOneSignService.insert(rgvOneSign);
+                if (!insert){
+                    throw new CoolException("鎵樼洏鐮佹爣璁版坊鍔犲け璐ワ紝璇烽噸鏂颁笅鍙戯紒锛侊紒");
+                }
+            }
+        }catch (Exception e){
+            throw new CoolException("鎵樼洏鐮佹爣璁版坊鍔犲紓甯革紝璇烽噸鏂颁笅鍙戯紒锛侊紒");
         }
-
 
         Date now = new Date();
         for (PalletizingCompleteTwoFloorParam.MatList matList:param.getMatList()){
@@ -1080,5 +1087,46 @@
         return crnStn;
     }
 
+    /*
+     * FQC璐ㄦ
+     * */
+    @Override
+    @Transactional
+    public void qualityInspection(QualityInspectionParam param) {
+        //鍒ゆ柇param鍙傛暟
+        if (Cools.isEmpty(param.getBoxNo())){
+            throw new CoolException("鍙傛暟锛氱鍙� boxNo涓虹┖");
+        }
+
+        List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>()
+                .eq("batch", param.getBoxNo())
+                .eq("model", param.getModel())
+        );
+        if (locDetlList.isEmpty()){
+            throw new CoolException("鏈煡璇㈠埌瀵瑰簲绠卞彿锛�"+param.getBoxNo()+";涓庡嵎鍙凤細"+param.getModel()+";鐨勭墿鏂�");
+        }
+        for (LocDetl locDetl:locDetlList){
+            if (locDetl.getDanger()!=0){
+                String dangerStr = "";
+                if (locDetl.getDanger()==1){
+                    dangerStr = "鍚堟牸";
+                }else if (locDetl.getDanger()==2){
+                    dangerStr = "涓嶅悎鏍�";
+                }
+                throw new CoolException("鏌ヨ鍒板搴旂鍙凤細"+param.getBoxNo()+";涓庡嵎鍙凤細"+param.getModel()+";鐨勭墿鏂�,浣嗘槸宸茬粡鏍囪涓�"+dangerStr+"锛屼笉鑳介噸澶嶆爣璁帮紒");
+            }
+        }
+        for (LocDetl locDetl:locDetlList){
+            if (locDetl.getDanger()==0){
+                locDetl.setDanger(param.getDanger());
+                locDetl.setMemo(param.getMemo());
+                locDetlService.update(locDetl,new EntityWrapper<LocDetl>()
+                        .eq("loc_no", locDetl.getLocNo())
+                        .eq("batch", param.getBoxNo()));
+            }
+        }
+
+    }
+
     /*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
 }

--
Gitblit v1.9.1