From 11972d7f05a60a2e117665ef4900f5f3ad43607d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 17 九月 2023 13:47:49 +0800
Subject: [PATCH] #贴标机修改完成

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   77 ++++++++++++++++++++++++++------------
 1 files changed, 53 insertions(+), 24 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 8bcba1e..2b64deb 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -592,21 +592,28 @@
         LabellerMatParam labellerMatParam = new LabellerMatParam();
         labellerMatParam.setDevNo(param.getDevNo());
         labellerMatParam.setLabNo(param.getLabNo());
-        ArrayList<LabellerMatParam.CombMat> combMats = new ArrayList<>();
-        String orderNo = "";
+        labellerMatParam.setWrkNo(basDevp.getWrkNo().toString());
+//        ArrayList<LabellerMatParam.CombMat> combMats = new ArrayList<>();
+        ArrayList<LabellerMatParam.BoxNo> boxNos = new ArrayList<>();
+//        String orderNo = "";
 
         for (WrkDetl wrkDetl:wrkDetls){
-            LabellerMatParam.CombMat combMat = new LabellerMatParam.CombMat(wrkDetl);
-            orderNo=wrkDetl.getOrderNo();
-            combMat.setTemp1("1");
-            combMats.add(combMat);
+            LabellerMatParam.BoxNo boxNo = new LabellerMatParam.BoxNo();
+            boxNo.setBoxNo(wrkDetl.getBatch());
+            boxNos.add(boxNo);
         }
+        labellerMatParam.setBoxNos(boxNos);
+//        for (WrkDetl wrkDetl:wrkDetls){
+//            LabellerMatParam.CombMat combMat = new LabellerMatParam.CombMat(wrkDetl);
+//            orderNo=wrkDetl.getOrderNo();
+//            combMat.setTemp1("1");
+//            combMats.add(combMat);
+//        }
 
-        labellerMatParam.setCombMats(combMats);
-        labellerMatParam.setLabellingTime(DateUtils.convert(new Date()));
-        labellerMatParam.setWrkNo(basDevp.getWrkNo().toString());
-        labellerMatParam.setLabTemplate("1");
-        labellerMatParam.setOrderNo(orderNo);
+//        labellerMatParam.setCombMats(combMats);
+//        labellerMatParam.setLabellingTime(DateUtils.convert(new Date()));
+//        labellerMatParam.setLabTemplate("1");
+//        labellerMatParam.setOrderNo(orderNo);
         wrkMast.setWrkSts(53L);
         if (!wrkMastService.updateById(wrkMast)){
             throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
@@ -723,14 +730,6 @@
 //        }
 
 
-        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type",201).eq("barcode", param.getBarcode()).eq("sta_no",param.getDevNo$()));
-        if (Cools.isEmpty(wrkMast) || !wrkMast.getWrkSts().equals(42L)){
-            throw new CoolException("鏌ヨ鎵樼洏澶辫触");
-        }else {
-            wrkMast.setWrkSts(wrkMast.getWrkSts()+1);
-        }
-
-
         if (locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()))!=0
             || wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()))!=0
             || waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()))!=0){
@@ -762,9 +761,6 @@
             if (!waitPakinService.insert(waitPakin)) {
                 throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
             }
-        }
-        if (!wrkMastService.updateById(wrkMast)){
-            throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
         }
 
     }
@@ -802,7 +798,7 @@
             for (WrkDetl wrkDetl:wrkDetls){
                 if (wrkDetl.getBatch().equals(matList.getBoxNo())){//鏈ㄧ缂栫爜
                     wrkDetl.setInspect(1);
-                    wrkDetlService.updateById(wrkDetl);
+                    wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("batch",wrkDetl.getBatch()));
                     wrkDetlsNew.add(wrkDetl);
                     sign=false;
                     break;
@@ -887,7 +883,7 @@
                     for (WrkDetl wrkDetl:wrkDetls){
                         if (wrkDetl.getBatch().equals(matList.getBoxNo())){//鏈ㄧ缂栫爜
                             wrkDetl.setOrigin(matList.getPosition());
-                            wrkDetlService.updateById(wrkDetl);
+                            wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("batch",wrkDetl.getBatch()));
                             sign=false;
                             break;
                         }
@@ -905,5 +901,38 @@
         }
     }
 
+    /*
+     *
+     * */
+    @Override
+    @Transactional
+    public void cs1(String barcode) {
+        BasDevp basDevp = basDevpService.selectById(216);
+        basDevp.setWrkNo(9992);
+        basDevp.setBarcode(barcode);
+        basDevpService.updateById(basDevp);
+    }
+
+    /*
+     *
+     * */
+    @Override
+    @Transactional
+    public void cs2() {
+        BasDevp basDevp = basDevpService.selectById(216);
+        basDevp.setWrkNo(0);
+        basDevp.setBarcode("");
+        basDevpService.updateById(basDevp);
+    }
+
+    /*
+     *
+     * */
+    @Override
+    @Transactional
+    public void cs3() {
+
+    }
+
     /*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
 }

--
Gitblit v1.9.1