From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码,解决冲突

---
 src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java |  107 ++++++------
 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java     |  133 ++++++++--------
 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java  |    2 
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java       |  230 +++++++++++++++-------------
 4 files changed, 241 insertions(+), 231 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index 7b2dde8..a9c2d01 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -60,7 +60,7 @@
             agvLocDetl.setLocNo(locNo);
             this.insert(agvLocDetl);
             // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
-            OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getThreeCode());
+            OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode());
 //            FlowLog flowLog = new FlowLog();
 //            flowLog.setFid(String.valueOf(flowId));
 //            flowLog.setSpare2(String.valueOf(taskCode));
@@ -91,39 +91,39 @@
 
     }
 
-    public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq,String type) {
+    public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq, String type) {
         //鏍规嵁鐗╂枡鍙峰拰鎵规鎵惧埌瀵瑰簲鐨勫簱瀛橈紝骞朵笖鎸夌収淇敼鏃堕棿鎺掑簭
         Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).orderBy("modi_time");
         if (type != null) {
             wrapper.notLike("loc_no", "F1");
         }
-        wapperSetCondition(wrapper,"batch",batch);
-        wapperSetCondition(wrapper,"three_code",csocode);
-        wapperSetCondition(wrapper,"dead_time",isoseq);
+        wapperSetCondition(wrapper, "batch", batch);
+        wapperSetCondition(wrapper, "three_code", csocode);
+        wapperSetCondition(wrapper, "dead_time", isoseq);
 
-        if ("JG".equals(orderNo.substring(0,2))) {
-            wapperSetCondition(wrapper,"process_sts","1");
+        if ("JG".equals(orderNo.substring(0, 2))) {
+            wapperSetCondition(wrapper, "process_sts", "1");
         }
 
         List<AgvLocDetl> agvLocDetls = this.selectList(wrapper);
 
-        for (AgvLocDetl agvLocDetl: agvLocDetls) {
+        for (AgvLocDetl agvLocDetl : agvLocDetls) {
             //鍒ゆ柇褰撳墠搴撲綅璐х墿鏄惁F鍦ㄥ簱
             AgvLocMast agvLocMast = agvLocMastService.selectById(agvLocDetl.getLocNo());
-            if(!"F".equals(agvLocMast.getLocSts())){
+            if (!"F".equals(agvLocMast.getLocSts())) {
                 continue;
             }
             //濡傛灉璁㈠崟鍓╀綑鍑哄簱閲忓ぇ浜�0
-            if(issued > 0) {
+            if (issued > 0) {
                 //褰撳墠搴撲綅鐨勫簱瀛橀噺
                 double anfme = agvLocDetl.getAnfme();
                 //int ioType = anfme > issued ? 101 : 103;
                 anfme = anfme > issued ? issued : anfme;
                 //鐢ㄤ簬鏄剧ず宸ヤ綔鏄庣粏妗g殑璁㈠崟鍙�
-                String orderNoWrkDtel = Utils.getOrderNo(orderNo,anfme);
+                String orderNoWrkDtel = Utils.getOrderNo(orderNo, anfme);
                 //鏇存柊璁㈠崟鏁伴噺
-                orderNo = Utils.orderMergeUpdate(orderNo,anfme);
-                LocDto locDto = new LocDto(agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getBatch(), orderNoWrkDtel, anfme,agvLocDetl.getProcessSts());
+                orderNo = Utils.orderMergeUpdate(orderNo, anfme);
+                LocDto locDto = new LocDto(agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getBatch(), orderNoWrkDtel, anfme, agvLocDetl.getProcessSts());
                 locDto.setCsocode(csocode);
                 locDto.setIsoseq(isoseq);
                 locDto.setContainerCode(agvLocDetl.getSuppCode());
@@ -131,7 +131,7 @@
                 //褰撳墠搴撲綅鎵�澶勬ゼ灞�
                 int floor = Integer.parseInt(agvLocDetl.getLocNo().split("F")[1]);
                 //locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
-                locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(),floor));
+                locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(), floor));
                 locDtoList.add(locDto);
 
                 issued -= anfme;
@@ -146,7 +146,7 @@
     鏇存柊搴撳瓨鏄庣粏
      */
     public void updateStock(String sourceLoc, String targetLoc) {
-        this.baseMapper.updateStock(sourceLoc,targetLoc);
+        this.baseMapper.updateStock(sourceLoc, targetLoc);
     }
 
     public Page<AgvLocDetl> getStockStatis(Page<AgvLocDetl> page) {
@@ -162,7 +162,7 @@
 
     @Override
     public AgvLocDetl selectItem(String locNo, String matnr, String batch, String csocode, String isoCode) {
-        return this.baseMapper.selectItemByOrderNo(locNo, matnr, batch,csocode,isoCode);
+        return this.baseMapper.selectItemByOrderNo(locNo, matnr, batch, csocode, isoCode);
     }
 
     @Override
@@ -176,12 +176,12 @@
     }
 
     @Override
-    public Double getSumAnfmeDb(String matnr, String threeCode,Integer floor) {
+    public Double getSumAnfmeDb(String matnr, String threeCode, Integer floor) {
         return this.baseMapper.selectSumAnfmeByMatnr2(matnr, threeCode, floor);
     }
 
     @Override
-    public Double getSumAnfmeback(String matnr, String threeCode,Integer floor) {
+    public Double getSumAnfmeback(String matnr, String threeCode, Integer floor) {
         return this.baseMapper.getSumAnfmeback(matnr, threeCode, floor);
     }
 
@@ -192,7 +192,7 @@
         return this.baseMapper.sum();
     }
 
-    public List<AgvLocDetl> getStockStatisExcel(){
+    public List<AgvLocDetl> getStockStatisExcel() {
         return this.baseMapper.getStockStatisExcel();
     }
 
@@ -201,20 +201,20 @@
             return new ArrayList<AgvLocDetl>();
         }
         EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
-        if(Cools.isEmpty(orderNo)){
-            wrapper.like("order_no",orderNo);
+        if (Cools.isEmpty(orderNo)) {
+            wrapper.like("order_no", orderNo);
         }
-        if(Cools.isEmpty(matnr)){
-            wrapper.like("matnr",matnr);
+        if (Cools.isEmpty(matnr)) {
+            wrapper.like("matnr", matnr);
         }
-        if(Cools.isEmpty(maktx)){
-            wrapper.like("maktx",maktx);
+        if (Cools.isEmpty(maktx)) {
+            wrapper.like("maktx", maktx);
         }
-        if(Cools.isEmpty(specs)){
-            wrapper.like("specs",specs);
+        if (Cools.isEmpty(specs)) {
+            wrapper.like("specs", specs);
         }
-        if(Cools.isEmpty()){
-            wrapper.like("loc_no",locNo);
+        if (Cools.isEmpty()) {
+            wrapper.like("loc_no", locNo);
         }
         return this.selectList(wrapper);
     }
@@ -222,42 +222,42 @@
     public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, String csocode, String isocode) {
         EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
         wrapper.eq("loc_no", locNo);
-        Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
+        Utils.confirmOnlyMat(wrapper, matnr, batch, csocode, isocode);
         if (anfme <= 0) {
-            return this.baseMapper.deleteLocDetl(locNo,anfme,matnr,batch,csocode,isocode) > 0;
+            return this.baseMapper.deleteLocDetl(locNo, anfme, matnr, batch, csocode, isocode) > 0;
         } else {
             AgvLocDetl agvLocDetl = this.selectOne(wrapper);
             agvLocDetl.setAnfme(anfme);
             agvLocDetl.setModiTime(new Date());
-            return this.baseMapper.updateAnfme(locNo,anfme,matnr,batch,csocode,isocode) > 0;
+            return this.baseMapper.updateAnfme(locNo, anfme, matnr, batch, csocode, isocode) > 0;
         }
     }
 
     public boolean updateAnfmeProcess(Double anfme, String locNo, String matnr, String batch, String csocode, String isocode, Integer process) {
         EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
         wrapper.eq("loc_no", locNo);
-        Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
+        Utils.confirmOnlyMat(wrapper, matnr, batch, csocode, isocode);
         if (anfme <= 0) {
-            return this.baseMapper.deleteLocDetl(locNo,anfme,matnr,batch,csocode,isocode) > 0;
+            return this.baseMapper.deleteLocDetl(locNo, anfme, matnr, batch, csocode, isocode) > 0;
         } else {
             AgvLocDetl agvLocDetl = this.selectOne(wrapper);
             agvLocDetl.setAnfme(anfme);
             agvLocDetl.setModiTime(new Date());
-            return this.baseMapper.updateAnfmeProcess(locNo,anfme,matnr,batch,csocode,isocode,process) > 0;
+            return this.baseMapper.updateAnfmeProcess(locNo, anfme, matnr, batch, csocode, isocode, process) > 0;
         }
     }
 
 
-    private void wapperSetCondition(Wrapper wrapper,String column, String condition){
-        if(Cools.isEmpty(condition)){
-            wrapper.andNew().eq(column,"").or().isNull(column);
-        }else {
-            wrapper.andNew().eq(column,condition);
+    private void wapperSetCondition(Wrapper wrapper, String column, String condition) {
+        if (Cools.isEmpty(condition)) {
+            wrapper.andNew().eq(column, "").or().isNull(column);
+        } else {
+            wrapper.andNew().eq(column, condition);
         }
     }
 
-    public AgvLocDetl selectByLocNo(String locNo){
-        return this.selectOne(new EntityWrapper<AgvLocDetl>().eq("loc_no",locNo));
+    public AgvLocDetl selectByLocNo(String locNo) {
+        return this.selectOne(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
     }
 
     @Override
@@ -265,7 +265,7 @@
         List<AgvLocDetl> agvLocDetls = new ArrayList<>();
 
         taskDto.getLocDtos().forEach(locDto -> {
-            AgvLocDetl agvLocDetl = this.selectByMatnrAndBatchAndCsocodeAndisoCode(locDto.getLocNo(),locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
+            AgvLocDetl agvLocDetl = this.selectByMatnrAndBatchAndCsocodeAndisoCode(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
             agvLocDetls.add(agvLocDetl);
         });
         return agvLocDetls;
@@ -274,16 +274,16 @@
     @Override
     public AgvLocDetl selectByMatnrAndBatchAndCsocodeAndisoCode(String locNo, String matnr, String batch, String csocode, String isocode) {
         EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
-        wrapper.eq("loc_no",locNo);
-        Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
+        wrapper.eq("loc_no", locNo);
+        Utils.confirmOnlyMat(wrapper, matnr, batch, csocode, isocode);
         return this.selectOne(wrapper);
     }
 
     @Override
-    public AgvLocDetl selectByMatnrAndBatchAndCsocodeAndisoCode2(String locNo,String orderNo, String matnr, String batch, String csocode, String isocode) {
+    public AgvLocDetl selectByMatnrAndBatchAndCsocodeAndisoCode2(String locNo, String orderNo, String matnr, String batch, String csocode, String isocode) {
         EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
-        wrapper.eq("loc_no",locNo);
-        Utils.confirmOnlyMat2(wrapper,orderNo,matnr,batch,csocode,isocode);
+        wrapper.eq("loc_no", locNo);
+        Utils.confirmOnlyMat2(wrapper, orderNo, matnr, batch, csocode, isocode);
         return this.selectOne(wrapper);
     }
 
@@ -299,7 +299,7 @@
 
     @Override
     public AgvLocDetl selectLocdetl(String locNo, String matnr, String batch, String csocode, String isocode) {
-        return this.baseMapper.selectLocdetl(locNo,matnr,batch,csocode,isocode);
+        return this.baseMapper.selectLocdetl(locNo, matnr, batch, csocode, isocode);
     }
 
     @Override
@@ -314,8 +314,7 @@
         try {
             if (excelVersion == 2003) {
                 book = new HSSFWorkbook(inStream);
-            }
-            else {  // 褰� excel 鏄� 2007 鏃�
+            } else {  // 褰� excel 鏄� 2007 鏃�
                 book = new XSSFWorkbook(inStream);
             }
         } catch (Exception e) {
@@ -335,10 +334,10 @@
             String containerCode = dataFormatter.formatCellValue(row.getCell(1));
 
             List<AgvLocDetl> agvLocDetls = this.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo).eq("supp_code", containerCode));
-            if(Cools.isEmpty(agvLocDetls)){
+            if (Cools.isEmpty(agvLocDetls)) {
                 log.info("搴撲綅鍙凤細" + locNo + "锛岃揣鏋剁爜锛�" + containerCode + "锛屼笉瀛樺湪鏄庣粏");
             }
-            if(agvLocDetls.size()>1){
+            if (agvLocDetls.size() > 1) {
                 log.info("搴撲綅鍙凤細" + locNo + "锛岃揣鏋剁爜锛�" + containerCode + "锛屽瓨鍦�1鏉′互涓婅褰�");
             }
         }
@@ -346,6 +345,6 @@
 
     @Override
     public void updateLocNo(String locNo, String sourceLoc, AgvLocDetl agvLocDetl) {
-        this.baseMapper.updateLocNo(locNo,sourceLoc,agvLocDetl.getSuppCode());
+        this.baseMapper.updateLocNo(locNo, sourceLoc, agvLocDetl.getSuppCode());
     }
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 704149f..4695d23 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -52,6 +52,8 @@
         return this.baseMapper.selectItemByOrderNo2(orderNo, matnr, batch, threeCode);
     }
 
+
+
     @Override
     public OrderDetl selectItemNoneOfBatch(String orderNo, String matnr) {
         return this.baseMapper.selectItemNoneOfBatch(orderNo, matnr);
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 64fc99d..b5ddaf2 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -135,9 +135,9 @@
         // 鐢熸垚宸ヤ綔妗f槑缁�
         List<DetlDto> detlDtos = new ArrayList<>();
         param.getList().forEach(elem -> {
-            DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getCsocode(), elem.getIsoseq(),elem.getContainerCode());
+            DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getCsocode(), elem.getIsoseq(), elem.getContainerCode());
             if (DetlDto.has(detlDtos, detlDto)) {
-                DetlDto detlDto1 = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getCsocode(),detlDto.getIsoseq(),detlDto.getContainerCode());
+                DetlDto detlDto1 = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(), detlDto.getCsocode(), detlDto.getIsoseq(), detlDto.getContainerCode());
                 assert detlDto1 != null;
                 detlDto1.setAnfme(detlDto1.getAnfme() + detlDto.getAnfme());
             } else {
@@ -149,20 +149,20 @@
         sourceStaNo.setWrkNo(workNo);
         sourceStaNo.setModiUser(userId);
         sourceStaNo.setModiTime(now);
-        if (!basDevpService.updateById(sourceStaNo)){
+        if (!basDevpService.updateById(sourceStaNo)) {
             throw new CoolException("鏇存柊婧愮珯澶辫触");
         }
         // 鏇存柊鐩爣搴撲綅鐘舵��
         LocMast locMast = locMastService.selectById(dto.getLocNo());
-        if (locMast.getLocSts().equals("O")){
+        if (locMast.getLocSts().equals("O")) {
             locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
             locMast.setModiUser(userId);
             locMast.setModiTime(now);
-            if (!locMastService.updateById(locMast)){
+            if (!locMastService.updateById(locMast)) {
                 throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
             }
         } else {
-            throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+            throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
         }
         return dto.getLocNo();
     }
@@ -171,24 +171,24 @@
     @Transactional
     public void startupFullTakeStore(StockOutParam param, Long userId) {
         ArrayList<String> locNos = new ArrayList<>();
-        for (StockOutParam.LocDetl locDetl:param.getLocDetls()){
-            if (!locNos.contains(locDetl.getLocNo())){
+        for (StockOutParam.LocDetl locDetl : param.getLocDetls()) {
+            if (!locNos.contains(locDetl.getLocNo())) {
                 locNos.add(locDetl.getLocNo());
             }
         }
         //妫�娴嬫槸鍚︿负娴呭簱浣�
-        boolean sign=false;
+        boolean sign = false;
         String th = "";
-        for (String locNo:locNos){
-            if (sign){
+        for (String locNo : locNos) {
+            if (sign) {
                 break;
             }
 
             //妫�娴嬪嚭搴撶殑璐х墿涓槸鍚︽湁鐘舵�佷负绂佹鐨勮揣鐗┿��
             for (LocDetl locDetl : locDetlService.selectByLocNo(locNo)) {
                 if (locDetl.getStockFreeze() == 0) {
-                    th="搴撲綅鍙凤細"+locNo+" 鏈夌姝㈠嚭搴撶殑璐х墿锛�";
-                    throw new CoolException("鍑哄簱澶辫触锛�"+th);
+                    th = "搴撲綅鍙凤細" + locNo + " 鏈夌姝㈠嚭搴撶殑璐х墿锛�";
+                    throw new CoolException("鍑哄簱澶辫触锛�" + th);
                 }
 
                 Mat mat = matService.selectByMatnr(locDetl.getMatnr());
@@ -196,30 +196,30 @@
                     continue;
                 }
                 if (mat.getStatus() == 0) {
-                    th="搴撲綅鍙凤細"+locNo+" 鏈夌姝㈠嚭搴撶殑璐х墿锛�";
-                    throw new CoolException("鍑哄簱澶辫触锛�"+th);
+                    th = "搴撲綅鍙凤細" + locNo + " 鏈夌姝㈠嚭搴撶殑璐х墿锛�";
+                    throw new CoolException("鍑哄簱澶辫触锛�" + th);
                 }
             }
 
             List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
             if (!Cools.isEmpty(groupOuterLoc)) {
                 for (String outerLoc : groupOuterLoc) {
-                    if (locNos.contains(outerLoc)){
+                    if (locNos.contains(outerLoc)) {
                         continue;
                     }
                     LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", outerLoc));
                     if (locMast != null) {
-                        if (!locMast.getLocSts().equals("O") && !locMast.getLocSts().equals("R")){
-                            sign=true;
-                            th="搴撲綅鍙凤細"+locNo+" 娴呭簱浣嶆湁闈炵┖搴撲綅锛�";
+                        if (!locMast.getLocSts().equals("O") && !locMast.getLocSts().equals("R")) {
+                            sign = true;
+                            th = "搴撲綅鍙凤細" + locNo + " 娴呭簱浣嶆湁闈炵┖搴撲綅锛�";
                             break;
                         }
                     }
                 }
             }
         }
-        if (sign){
-            throw new CoolException("鍑哄簱澶辫触锛�"+th);
+        if (sign) {
+            throw new CoolException("鍑哄簱澶辫触锛�" + th);
         }
         // 鐩爣绔欑偣鐘舵�佹娴�
         BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
@@ -238,6 +238,7 @@
             throw new CoolException("搴撳瓨涓嶅瓨鍦�");
         }
     }
+
     /**
      * 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
      */
@@ -247,6 +248,7 @@
         }
         throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
     }
+
     /**
      * 閫氳繃搴撲綅鍙疯幏鍙� 鍒�
      */
@@ -256,6 +258,7 @@
         }
         throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
     }
+
     /**
      * 閫氳繃搴撲綅鍙疯幏鍙� 灞�
      */
@@ -290,7 +293,7 @@
 
         ArrayList<String> outerLocs = new ArrayList<>();
         //妫�娴嬫槸鍚︿负娴呭簱浣�
-        boolean sign=false;
+        boolean sign = false;
         String th = "";
         for (String locNo : locNos) {
             if (sign) {
@@ -336,7 +339,7 @@
         //**************325銆�331銆�333銆�339绔欑偣棰濆閫昏緫浠g爜**************
         HashMap<String, Object> tmpMap = new HashMap<>();
         if (staNo.getDevNo() == 325 || staNo.getDevNo() == 331 || staNo.getDevNo() == 333 || staNo.getDevNo() == 339) {
-            int[] data = {325,331,333,339};
+            int[] data = {325, 331, 333, 339};
             for (String locNo : locNos) {
                 List<String> groupOuterLoc = Utils.getGroupDeepLoc(locNo);
                 if (groupOuterLoc.isEmpty()) {
@@ -407,8 +410,9 @@
             wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
             Double ioPri = wrkMastService.getIoPri(ioType, dto.getLocNo());
             wrkMast.setIoPri(ioPri); // 浼樺厛绾э細13
-            wrkMast.setOutMost(outMost?1:0);;
-            wrkMast.setCrnNo(outMost?outCrnNo:locMast.getCrnNo());
+            wrkMast.setOutMost(outMost ? 1 : 0);
+            ;
+            wrkMast.setCrnNo(outMost ? outCrnNo : locMast.getCrnNo());
             wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
             wrkMast.setStaNo(stnNo); // 鐩爣绔�
             wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
@@ -423,17 +427,19 @@
             wrkMast.setModiUser(userId);
             wrkMast.setModiTime(now);
             if (!wrkMastService.insert(wrkMast)) {
-                throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+dto.getLocNo());
+                throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + dto.getLocNo());
             }
             // 鐢熸垚宸ヤ綔妗f槑缁�
             for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
-                if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
+                if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
+                    continue;
+                }
                 WrkDetl wrkDetl = new WrkDetl();
                 wrkDetl.sync(detlDto.getLocDetl());
                 wrkDetl.setOrderNo(""); // 鎵嬪姩鍑哄簱涓嶉渶瑕佸甫鍑哄簱瀛樹腑鐨勫崟鎹紪鍙�
                 wrkDetl.setWrkNo(workNo);
                 wrkDetl.setIoTime(now);
-                Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();
+                Double anfme = ioType == 101 ? detlDto.getLocDetl().getAnfme() : detlDto.getCount();
                 wrkDetl.setAnfme(anfme); // 鏁伴噺
                 wrkDetl.setAppeTime(now);
                 wrkDetl.setAppeUser(userId);
@@ -446,11 +452,11 @@
             // 淇敼搴撲綅鐘舵��:   F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷f枡/鐩樼偣/骞舵澘鍑哄簱涓�
             locMast = locMastService.selectById(dto.getLocNo());
             if (locMast.getLocSts().equals("F")) {
-                locMast.setLocSts(ioType==101?"R":"P");
+                locMast.setLocSts(ioType == 101 ? "R" : "P");
                 locMast.setModiUser(userId);
                 locMast.setModiTime(now);
                 if (!locMastService.updateById(locMast)) {
-                    throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+dto.getLocNo());
+                    throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + dto.getLocNo());
                 }
             } else {
                 throw new CoolException(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
@@ -500,12 +506,13 @@
         wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
         Double ioPri = wrkMastService.getIoPri(ioType, taskDto.getLocNo());
         wrkMast.setIoPri(ioPri); // 浼樺厛绾э細13
-        wrkMast.setOutMost(outMost?1:0);;
-        wrkMast.setCrnNo(outMost?outCrnNo:locMast.getCrnNo());
+        wrkMast.setOutMost(outMost ? 1 : 0);
+        ;
+        wrkMast.setCrnNo(outMost ? outCrnNo : locMast.getCrnNo());
         wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
         wrkMast.setStaNo(stnNo); // 鐩爣绔�
         wrkMast.setPltType(locMast.getPltType());
-        if(ioType == 101 && taskDto.getStaNo()>=300){
+        if (ioType == 101 && taskDto.getStaNo() >= 300) {
             wrkMast.setSourceStaNo(346); // 婧愮珯
             wrkMast.setStaNo(346); // 鐩爣绔�
         }
@@ -521,11 +528,13 @@
         wrkMast.setModiUser(userId);
         wrkMast.setModiTime(now);
         if (!wrkMastService.insert(wrkMast)) {
-            throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+taskDto.getLocNo());
+            throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + taskDto.getLocNo());
         }
         // 鐢熸垚宸ヤ綔妗f槑缁�
         for (LocDto locDto : taskDto.getLocDtos()) {
-            if (locDto.getAnfme()==null || locDto.getAnfme() <= 0.0D) { continue; }
+            if (locDto.getAnfme() == null || locDto.getAnfme() <= 0.0D) {
+                continue;
+            }
             LocDetl locDetl = locDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getContainerCode());
             if (locDetl == null || locDetl.getAnfme() < locDto.getAnfme()) {
                 throw new CoolException(locDto.getLocNo() + "搴撲綅涓�" + locDto.getMatnr() + "鍟嗗搧搴撳瓨涓嶈冻锛�");
@@ -554,7 +563,7 @@
                 }
                 //琛ヨ揣鍗曞垯鐢熸垚AGV鍏ュ簱閫氱煡妗�
                 generateAgvWaitpakin(wrkDetl);
-            }else {
+            } else {
                 List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
                 orderDtoList.forEach(orderDto -> {
                     WrkDetl wrkDetl = new WrkDetl();
@@ -582,11 +591,11 @@
 
             // 淇敼璁㈠崟鏄庣粏
             if (!BaseController.isJSON(locDto.getOrderNo())) {
-                OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getCsocode(),locDto.getIsoseq());
+                OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
                 if (orderDetl == null) {
-                    orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null,locDto.getCsocode(),locDto.getIsoseq());
+                    orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null, locDto.getCsocode(), locDto.getIsoseq());
                 }
-                if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme(),locDto.getCsocode(),locDto.getIsoseq())) {
+                if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme(), locDto.getCsocode(), locDto.getIsoseq())) {
                     throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
                 }
                 orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
@@ -600,20 +609,20 @@
                 Double orderAnfme;
 
                 for (OrderDto orderDto : orderDtoList) {
-                    OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getCsocode(),locDto.getIsoseq());
+                    OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
                     if (orderDetl == null) {
-                        orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), null,locDto.getCsocode(),locDto.getIsoseq());
+                        orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), null, locDto.getCsocode(), locDto.getIsoseq());
                     }
 
                     orderAnfme = orderDetl.getAnfme() - orderDetl.getQty();
 
-                    if(locAnfme > orderAnfme){
+                    if (locAnfme > orderAnfme) {
                         locAnfme -= orderAnfme;
-                    }else {
+                    } else {
                         orderAnfme = locAnfme;
                     }
 
-                    if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderAnfme,orderDetl.getThreeCode(),orderDetl.getDeadTime())) {
+                    if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderAnfme, orderDetl.getThreeCode(), orderDetl.getDeadTime())) {
                         throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
                     }
                     orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
@@ -623,11 +632,11 @@
         // 淇敼搴撲綅鐘舵��:   F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷f枡/鐩樼偣/骞舵澘鍑哄簱涓�
         locMast = locMastService.selectById(taskDto.getLocNo());
         if (locMast.getLocSts().equals("F")) {
-            locMast.setLocSts(ioType==101?"R":"P");
+            locMast.setLocSts(ioType == 101 ? "R" : "P");
             locMast.setModiUser(userId);
             locMast.setModiTime(now);
             if (!locMastService.updateById(locMast)) {
-                throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+taskDto.getLocNo());
+                throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + taskDto.getLocNo());
             }
         } else {
             throw new CoolException(taskDto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
@@ -651,7 +660,8 @@
         wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
         Double ioPri = wrkMastService.getIoPri(10, dto.getLocNo());
         wrkMast.setIoPri(ioPri); // 浼樺厛绾э細10
-        wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true)?1:0);;
+        wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true) ? 1 : 0);
+        ;
         wrkMast.setCrnNo(dto.getCrnNo());
         wrkMast.setSourceStaNo(dto.getSourceStaNo());
         wrkMast.setStaNo(dto.getStaNo());
@@ -675,20 +685,20 @@
         sourceStaNo.setWrkNo(workNo);
         sourceStaNo.setModiUser(userId);
         sourceStaNo.setModiTime(new Date());
-        if (!basDevpService.updateById(sourceStaNo)){
+        if (!basDevpService.updateById(sourceStaNo)) {
             throw new CoolException("鏇存柊婧愮珯澶辫触");
         }
         // 鏇存柊鐩爣搴撲綅鐘舵��
         LocMast locMast = locMastService.selectById(dto.getLocNo());
-        if (locMast.getLocSts().equals("O")){
+        if (locMast.getLocSts().equals("O")) {
             locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
             locMast.setModiUser(userId);
             locMast.setModiTime(new Date());
-            if (!locMastService.updateById(locMast)){
+            if (!locMastService.updateById(locMast)) {
                 throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
             }
         } else {
-            throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+            throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
         }
         return dto.getLocNo();
     }
@@ -698,31 +708,31 @@
     public void emptyPlateOut(EmptyPlateOutParam param, Long userId) {
         List<String> locNos = param.getLocNos();
         //妫�娴嬫槸鍚︿负娴呭簱浣�
-        boolean sign=false;
+        boolean sign = false;
         String th = "";
-        for (String locNo:locNos){
-            if (sign){
+        for (String locNo : locNos) {
+            if (sign) {
                 break;
             }
             List<String> groupInnerLoc = Utils.getGroupInnerLoc(locNo);
             if (!Cools.isEmpty(groupInnerLoc)) {
                 for (String insideLoc : groupInnerLoc) {
-                    if (locNos.contains(insideLoc)){
+                    if (locNos.contains(insideLoc)) {
                         continue;
                     }
                     LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", insideLoc));
                     if (locMast != null) {
-                        if (!locMast.getLocSts().equals("O") && !locMast.getLocSts().equals("R")){
-                            sign=true;
-                            th="搴撲綅鍙凤細"+locNo+" 娴呭簱浣嶆湁闈炵┖搴撲綅锛�";
+                        if (!locMast.getLocSts().equals("O") && !locMast.getLocSts().equals("R")) {
+                            sign = true;
+                            th = "搴撲綅鍙凤細" + locNo + " 娴呭簱浣嶆湁闈炵┖搴撲綅锛�";
                             break;
                         }
                     }
                 }
             }
         }
-        if (sign){
-            throw new CoolException("鍑哄簱澶辫触锛�"+th);
+        if (sign) {
+            throw new CoolException("鍑哄簱澶辫触锛�" + th);
         }
         if (Cools.isEmpty(param.getOutSite())) {
             throw new CoolException("绔欑偣涓嶅瓨鍦�");
@@ -740,14 +750,12 @@
             // 鑾峰彇搴撲綅
             LocMast locMast = locMastService.selectById(locNo);
             if (Cools.isEmpty(locMast)) {
-                throw new CoolException(locNo+"搴撲綅涓嶅瓨鍦�");
+                throw new CoolException(locNo + "搴撲綅涓嶅瓨鍦�");
             }
             Boolean outMost = locMastService.isOutMost(locNo, false);
             Integer outCrnNo = locMastService.getOutCrnNo(locMast);
             // 鑾峰彇婧愮珯
-            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
-                    .eq("type_no", 110)
-                    .eq("stn_no", param.getOutSite());
+            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>().eq("type_no", 110).eq("stn_no", param.getOutSite());
             StaDesc staDesc = staDescService.selectOne(wrapper);
             if (Cools.isEmpty(staDesc)) {
                 throw new CoolException("闈炴硶璺緞锛�");
@@ -766,8 +774,9 @@
             wrkMast.setIoPri(ioPri);
             wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
             wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔�
-            wrkMast.setOutMost(outMost?1:0);;
-            wrkMast.setCrnNo(outMost?outCrnNo:locMast.getCrnNo());
+            wrkMast.setOutMost(outMost ? 1 : 0);
+            ;
+            wrkMast.setCrnNo(outMost ? outCrnNo : locMast.getCrnNo());
             wrkMast.setSourceLocNo(locNo); // 婧愬簱浣�
             wrkMast.setFullPlt("N"); // 婊℃澘锛歒
             wrkMast.setPicking("N"); // 鎷f枡
@@ -783,7 +792,7 @@
                 throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
             }
             // 鏇存柊搴撲綅鐘舵�� D.绌烘澘 -> R.鍑哄簱棰勭害
-            if (locMast.getLocSts().equals("D")){
+            if (locMast.getLocSts().equals("D")) {
                 locMast.setLocSts("R");
                 locMast.setModiUser(userId);
                 locMast.setModiTime(new Date());
@@ -803,7 +812,7 @@
         List<LocDetlDto> locDetlDtos = new ArrayList<>();
         for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
             if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
-                LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch(),paramLocDetl.getSuppCode());
+                LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch(), paramLocDetl.getSuppCode());
                 if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
             }
         }
@@ -820,11 +829,11 @@
     public void locMove(String sourceLocNo, String locNo, Long userId) {
         LocMast sourceLoc = locMastService.selectById(sourceLocNo);
         List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
-        if (Cools.isEmpty(sourceLoc)){
+        if (Cools.isEmpty(sourceLoc)) {
             throw new CoolException("鏈壘鍒板簱浣�");
         }
         LocMast loc = locMastService.selectById(locNo);
-        if (Cools.isEmpty(loc)){
+        if (Cools.isEmpty(loc)) {
             throw new CoolException("鏈壘鍒板簱浣�");
         }
         if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
@@ -840,14 +849,15 @@
         wrkMast.setWrkSts(21L); // 宸ヤ綔鐘舵�侊細21.鐢熸垚鍑哄簱浠诲姟
         wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
         wrkMast.setIoPri(10D);
-        wrkMast.setOutMost(locMastService.isOutMost(locNo, false)?1:0);;
+        wrkMast.setOutMost(locMastService.isOutMost(locNo, false) ? 1 : 0);
+        ;
         wrkMast.setCrnNo(sourceLoc.getCrnNo());
         wrkMast.setSourceLocNo(sourceLocNo); // 婧愬簱浣�
         wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
-        wrkMast.setFullPlt(Cools.isEmpty(locDetls)?"N":"Y"); // 婊℃澘锛歒
+        wrkMast.setFullPlt(Cools.isEmpty(locDetls) ? "N" : "Y"); // 婊℃澘锛歒
         wrkMast.setPicking("N"); // 鎷f枡
         wrkMast.setExitMk("N"); // 閫�鍑�
-        wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 绌烘澘
+        wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D") ? "Y" : "N"); // 绌烘澘
         wrkMast.setBarcode(sourceLoc.getBarcode()); // 璐ф灦鐮�
         wrkMast.setLinkMis("N");
         wrkMast.setAppeUser(userId);
@@ -878,11 +888,11 @@
             sourceLoc.setLocSts("R"); // R.鍑哄簱棰勭害
             sourceLoc.setModiUser(userId);
             sourceLoc.setModiTime(now);
-            if (!locMastService.updateById(sourceLoc)){
+            if (!locMastService.updateById(sourceLoc)) {
                 throw new CoolException("鏇存柊婧愬簱浣嶇姸鎬佸け璐�");
             }
         } else {
-            throw new CoolException(sourceLoc.getLocNo() + "婧愬簱浣嶅嚭搴撳け璐ワ紝鐘舵�侊細"+sourceLoc.getLocSts$());
+            throw new CoolException(sourceLoc.getLocNo() + "婧愬簱浣嶅嚭搴撳け璐ワ紝鐘舵�侊細" + sourceLoc.getLocSts$());
         }
         // 淇敼鐩爣搴撲綅鐘舵��
         if (loc.getLocSts().equals("O")) {
@@ -893,7 +903,7 @@
                 throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
             }
         } else {
-            throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細"+loc.getLocSts$());
+            throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細" + loc.getLocSts$());
         }
     }
 
@@ -901,8 +911,8 @@
     @Transactional
     public void completeWrkMast(String workNo, Long userId) {
         WrkMast wrkMast = wrkMastService.selectById(workNo);
-        if (Cools.isEmpty(wrkMast)){
-            throw new CoolException(workNo+"宸ヤ綔妗d笉瀛樺湪");
+        if (Cools.isEmpty(wrkMast)) {
+            throw new CoolException(workNo + "宸ヤ綔妗d笉瀛樺湪");
         }
 
         if (wrkMast.getIoType() == 200) {
@@ -915,7 +925,7 @@
             throw new CoolException("褰撳墠宸ヤ綔妗e凡瀹屾垚");
         }
         // 鍏ュ簱 + 搴撲綅杞Щ
-        if (wrkMast.getWrkSts() < 9 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()==11)) {
+        if (wrkMast.getWrkSts() < 9 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType() == 11)) {
             wrkMast.setWrkSts(9L);
             // 鍑哄簱
         } else if (wrkMast.getWrkSts() > 20) {
@@ -958,12 +968,14 @@
             Iterator<LocDetlAdjustParam.LocDetlAdjust> iterator1 = list.iterator();
             while (iterator1.hasNext()) {
                 LocDetlAdjustParam.LocDetlAdjust adjust = iterator1.next();
-                if (adjust.getCount() == 0) { continue; }
-                if (locDetl.getMatnr().equals(adjust.getMatnr()) && Cools.eq(locDetl.getBatch(), adjust.getBatch()) && Cools.eq(locDetl.getSuppCode(),adjust.getSuppCode()) && Cools.eq(locDetl.getThreeCode(),adjust.getThreeCode()) && Cools.eq(locDetl.getDeadTime(),adjust.getDeadTime())) {
+                if (adjust.getCount() == 0) {
+                    continue;
+                }
+                if (locDetl.getMatnr().equals(adjust.getMatnr()) && Cools.eq(locDetl.getBatch(), adjust.getBatch()) && Cools.eq(locDetl.getSuppCode(), adjust.getSuppCode()) && Cools.eq(locDetl.getThreeCode(), adjust.getThreeCode()) && Cools.eq(locDetl.getDeadTime(), adjust.getDeadTime())) {
                     if (!locDetl.getAnfme().equals(adjust.getCount())) {
                         // todo 鐩樼偣璁板綍
                         // 淇敼搴撳瓨
-                        if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(),locDetl.getSuppCode(),locDetl.getThreeCode(),locDetl.getDeadTime())) {
+                        if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getSuppCode(), locDetl.getThreeCode(), locDetl.getDeadTime())) {
                             throw new CoolException(locDetl.getLocNo() + "搴撲綅锛�" + locDetl.getMatnr() + "鍟嗗搧锛�" + locDetl.getBatch() + "搴忓垪鐮佷慨鏀规暟閲忓け璐�");
                         }
                         // 淇濆瓨璋冩暣璁板綍
@@ -992,7 +1004,7 @@
         // 鍒犻櫎搴撳瓨
         for (LocDetl locDetl : locDetls) {
             // todo 鐩樼偣璁板綍
-            if (!locDetlService.updateAnfme(-1.0D, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(),locDetl.getSuppCode(),locDetl.getThreeCode(),locDetl.getDeadTime())) {
+            if (!locDetlService.updateAnfme(-1.0D, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getSuppCode(), locDetl.getThreeCode(), locDetl.getDeadTime())) {
                 throw new CoolException("鍒犻櫎" + locDetl.getLocNo() + "搴撲綅锛�" + locDetl.getMatnr() + "鍟嗗搧锛�" + locDetl.getBatch() + "搴忓垪鐮佸簱瀛樻槑缁嗗け璐�");
             }
             // 淇濆瓨璋冩暣璁板綍
@@ -1012,7 +1024,9 @@
 
         // 娣诲姞搴撳瓨
         for (LocDetlAdjustParam.LocDetlAdjust adjust : list) {
-            if (adjust.getCount() == 0.0D) { continue; }
+            if (adjust.getCount() == 0.0D) {
+                continue;
+            }
             Mat mat = matService.selectByMatnr(adjust.getMatnr());
             LocDetl locDetl = new LocDetl();
             locDetl.sync(mat);
@@ -1069,8 +1083,8 @@
     @Transactional
     public void cancelWrkMast(String workNo, Long userId) {
         WrkMast wrkMast = wrkMastService.selectById(workNo);
-        if (Cools.isEmpty(wrkMast)){
-            throw new CoolException(workNo+"宸ヤ綔妗d笉瀛樺湪");
+        if (Cools.isEmpty(wrkMast)) {
+            throw new CoolException(workNo + "宸ヤ綔妗d笉瀛樺湪");
         }
 
         if (wrkMast.getIoType() == 200) {
@@ -1091,29 +1105,29 @@
                 // 搴撲綅杞Щ锛氭簮搴撲綅
                 LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
                 if (Cools.isEmpty(locMast)) {
-                    throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛屾簮搴撲綅涓嶅瓨鍦�:"+ wrkMast.getSourceLocNo());
+                    throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛屾簮搴撲綅涓嶅瓨鍦�:" + wrkMast.getSourceLocNo());
                 }
                 locMast.setLocSts("F");
                 locMast.setModiTime(new Date());
                 locMast.setModiUser(userId);
                 locMastService.updateById(locMast);
             }
-        // 鍑哄簱鍙栨秷锛堜慨鏀规簮搴撲綅锛�
+            // 鍑哄簱鍙栨秷锛堜慨鏀规簮搴撲綅锛�
         } else if (wrkMast.getWrkSts() > 20) {
             locNo = wrkMast.getSourceLocNo();
             // 鍑哄簱 ===>> F.鍦ㄥ簱
             if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {
                 locSts = "F";
-            // 绌烘澘鍑哄簱 ===>> D.绌烘《/绌烘爤鏉�
+                // 绌烘澘鍑哄簱 ===>> D.绌烘《/绌烘爤鏉�
             } else if (wrkMast.getIoType() == 110) {
                 locSts = "D";
-            // 搴撲綅杞Щ ===>> D.绌烘《/绌烘爤鏉�
+                // 搴撲綅杞Щ ===>> D.绌烘《/绌烘爤鏉�
             } else if (wrkMast.getIoType() == 11) {
-                locSts = wrkMast.getFullPlt().equalsIgnoreCase("N")?"D":"F";
+                locSts = wrkMast.getFullPlt().equalsIgnoreCase("N") ? "D" : "F";
                 // 搴撲綅杞Щ锛氱洰鏍囧簱浣�
                 LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
                 if (Cools.isEmpty(locMast)) {
-                    throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛岀洰鏍囧簱浣嶄笉瀛樺湪:"+ wrkMast.getSourceLocNo());
+                    throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛岀洰鏍囧簱浣嶄笉瀛樺湪:" + wrkMast.getSourceLocNo());
                 }
                 locMast.setLocSts("O");
                 locMast.setModiTime(new Date());
@@ -1130,7 +1144,7 @@
             if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                 if (!BaseController.isJSON(wrkDetl.getOrderNo())) {
 
-                    if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme(),wrkDetl.getThreeCode(),wrkDetl.getDeadTime())) {
+                    if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme(), wrkDetl.getThreeCode(), wrkDetl.getDeadTime())) {
                         throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
                     }
                 } else {
@@ -1144,14 +1158,14 @@
                     List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
                     for (OrderDto orderDto : orderDtoList) {
 
-                        if(wrkDetlAnfme > orderDto.getAnfme()){
+                        if (wrkDetlAnfme > orderDto.getAnfme()) {
                             orderAnfme = orderDto.getAnfme();
                             wrkDetlAnfme -= orderAnfme;
-                        }else {
+                        } else {
                             orderAnfme = wrkDetlAnfme;
                         }
 
-                        if (!orderDetlService.decrease(orderDto.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), orderAnfme,wrkDetl.getThreeCode(),wrkDetl.getDeadTime())) {
+                        if (!orderDetlService.decrease(orderDto.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), orderAnfme, wrkDetl.getThreeCode(), wrkDetl.getDeadTime())) {
                             throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
                         }
                     }
@@ -1185,7 +1199,7 @@
         // 淇敼搴撲綅鐘舵��
         LocMast locMast = locMastService.selectById(locNo);
         if (Cools.isEmpty(locMast)) {
-            throw new CoolException("鍙栨秷宸ヤ綔妗eけ璐ワ紝搴撲綅涓嶅瓨鍦�:"+ locNo);
+            throw new CoolException("鍙栨秷宸ヤ綔妗eけ璐ワ紝搴撲綅涓嶅瓨鍦�:" + locNo);
         }
         locMast.setLocSts(locSts);
         locMast.setModiTime(new Date());
@@ -1200,8 +1214,8 @@
     @Transactional
     public void pickWrkMast(String workNo, Long userId) {
         WrkMast wrkMast = wrkMastService.selectById(workNo);
-        if (Cools.isEmpty(wrkMast)){
-            throw new CoolException(workNo+"宸ヤ綔妗d笉瀛樺湪");
+        if (Cools.isEmpty(wrkMast)) {
+            throw new CoolException(workNo + "宸ヤ綔妗d笉瀛樺湪");
         }
         // 鍏ュ嚭搴撶被鍨嬪垽鏂�
         if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
@@ -1220,9 +1234,7 @@
             throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗eけ璐�");
         }
         // 鑾峰彇鐩爣绔�
-        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
-                .eq("type_no", wrkMast.getIoType() - 50)
-                .eq("stn_no", wrkMast.getStaNo()) // 浣滀笟绔欑偣 = 鎷f枡鍑哄簱鐨勭洰鏍囩珯
+        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>().eq("type_no", wrkMast.getIoType() - 50).eq("stn_no", wrkMast.getStaNo()) // 浣滀笟绔欑偣 = 鎷f枡鍑哄簱鐨勭洰鏍囩珯
                 .eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
         StaDesc staDesc = staDescService.selectOne(wrapper);
         if (Cools.isEmpty(staDesc)) {
@@ -1266,25 +1278,25 @@
         return "";
     }
 
-    private void generateAgvWaitpakin(WrkDetl wrkDetl){
+    private void generateAgvWaitpakin(WrkDetl wrkDetl) {
         String orderNo = wrkDetl.getOrderNo();
-        if(orderNo.contains("{")){
+        if (orderNo.contains("{")) {
             JSONArray orderArray = JSON.parseArray(orderNo);
-            for (Object o : orderArray){
+            for (Object o : orderArray) {
                 JSONObject jsonobject = (JSONObject) o;
                 Order order = orderService.selectByNo(jsonobject.get("orderNo").toString());
                 DocType docType = docTypeService.selectById(order.getDocType());
-                if("浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())){
+                if ("浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())) {
                     throw new CoolException("鍚堝苟鍗曟嵁涓寘鍚汉宸ヨˉ璐у崟锛屽崟鎹负: " + jsonobject.get("orderNo"));
                 }
             }
 
-        }else {
+        } else {
             Order order = orderService.selectByNo(orderNo);
             DocType docType = docTypeService.selectById(order.getDocType());
-            if("浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())){
+            if ("浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())) {
                 AgvWaitPakin agvWaitPakin = new AgvWaitPakin();
-                BeanUtils.copyProperties(wrkDetl,agvWaitPakin);
+                BeanUtils.copyProperties(wrkDetl, agvWaitPakin);
                 agvWaitPakinService.insert(agvWaitPakin);
             }
         }
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 9b0d1aa..adfe4fc 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -108,8 +108,6 @@
     @Autowired
     private OrderDetlService orderDetlService;
     @Autowired
-    private OrderDetlService orderDetlService;
-    @Autowired
     private SnowflakeIdWorker snowflakeIdWorker;
     @Autowired
     private FlowLogService flowLogService;
@@ -119,10 +117,9 @@
         //鐢ㄤ簬涓婃姤mes鐨勫伐浣滄。鏄庣粏
         List<AgvWrkDetl> agvWrkDetlListOld = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
 
-        try {
         long flowId = snowflakeIdWorker.nextId();
         Date now = new Date();
-        try{
+        try {
             int wrkNo = agvWrkMast.getWrkNo();
             String barcode = agvWrkMast.getBarcode();
             String orderNo = getOrderNoByWrkNo(wrkNo);
@@ -208,7 +205,7 @@
 //                            if (!flowLogService.insert(flowLog)) {
 //                                throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
 //                            }
-                            agvLocDetlService.updateAnfme(updateAnfme,agvLocDetl.getLocNo(),agvLocDetl.getMatnr(),agvLocDetl.getBatch(),agvLocDetl.getThreeCode(),agvLocDetl.getDeadTime());
+                            agvLocDetlService.updateAnfme(updateAnfme, agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getBatch(), agvLocDetl.getThreeCode(), agvLocDetl.getDeadTime());
                         }
                         //AgvLocDetl agvLocDetl = agvLocDetlService.selectLocdetl(agvWrkMast.getLocNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getBatch(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
 
@@ -230,60 +227,60 @@
                         }
                     });
                     // 鏇存柊绔欑偣 + 搴撲綅鐘舵��     婧愬簱浣嶆槸绔欑偣
-                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
+                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                     break;
                 case 58:
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
-                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
+                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
                     break;
                 case 108:
                 case 114:
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                     //鏇存柊搴撳瓨鏄庣粏
-                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
+                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
                     //淇敼婧愬簱浣嶇姸鎬佷负O
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
+                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
                     break;
                 case 109:
                     // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
-                    if (agvWrkMast.getLocNo().substring(0,2).equals("DB")) {
-                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                    if (agvWrkMast.getLocNo().substring(0, 2).equals("DB")) {
+                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                         // 鎺ラ┏浣� -- 搴撲綅
                     } else {
-                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "D", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                     }
                     // 鎺ラ┏浣� -- 搴撲綅
-                    if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
-                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
+                    if (agvWrkMast.getSourceLocNo().substring(0, 2).equals("DB")) {
+                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);
                         // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
                     } else {
                         //淇敼婧愬簱浣嶇姸鎬佷负O
-                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
+                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
                     }
                     break;
                 case 111:
                     // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
-                    if (agvWrkMast.getLocNo().substring(0,2).equals("DB")) {
-                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                    if (agvWrkMast.getLocNo().substring(0, 2).equals("DB")) {
+                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                         // 鎺ラ┏浣� -- 搴撲綅
                     } else {
-                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "D", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                     }
 
                     // 鎺ラ┏浣� -- 搴撲綅
-                    if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
-                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
+                    if (agvWrkMast.getSourceLocNo().substring(0, 2).equals("DB")) {
+                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);
                         // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
                     } else {
                         //淇敼婧愬簱浣嶇姸鎬佷负O
-                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
+                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
                         //鏇存柊鐩爣搴撲綅鏄庣粏 101.鍑哄簱 鍒犻櫎婧愬簱浣嶅簱瀛樻槑缁�
-                        agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvWrkMast.getSourceLocNo()));
+                        agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvWrkMast.getSourceLocNo()));
                     }
                     break;
                 case 112:
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                     List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
                     for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
                         AgvLocDetl locDetl = new AgvLocDetl();
@@ -293,27 +290,27 @@
                         agvLocDetlService.insert(locDetl);
                     }
                     // 鎺ラ┏浣� -- 搴撲綅
-                    if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
-                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
+                    if (agvWrkMast.getSourceLocNo().substring(0, 2).equals("DB")) {
+                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);
                         // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
                     } else {
                         //淇敼婧愬簱浣嶇姸鎬佷负O
-                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
+                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
                     }
                     break;
                 case 113:
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "D", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                     // 鎺ラ┏浣� -- 搴撲綅
-                    if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
-                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
+                    if (agvWrkMast.getSourceLocNo().substring(0, 2).equals("DB")) {
+                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);
                     }
                     break;
                 case 121:
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                     //鏇存柊搴撳瓨鏄庣粏
-                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
+                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
                     //淇敼婧愬簱浣嶇姸鎬佷负O
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
+                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
                     break;
 
                 default:
@@ -323,7 +320,7 @@
                 //鍒犻櫎AGV宸ヤ綔妗�
                 agvWrkMastService.deleteById(wrkNo);
                 //鍒犻櫎AGV宸ヤ綔鏄庣粏妗�
-                agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
+                agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkNo));
             }
 //            else {
 //                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
@@ -333,7 +330,7 @@
 //                agvWrkMastService.updateById(agvWrkMast);
 //            }
 
-            if(!isJSON(orderNo)){
+            if (!isJSON(orderNo)) {
                 //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
                 orderService.checkComplete(orderNo, agvWrkMast.getPltType());
             } else {
@@ -383,11 +380,11 @@
             agvWrkMastService.updateById(agvWrkMast);
             //淇敼婧愬簱浣嶇姸鎬佷负O
             if (agvWrkMast.getIoType() == 110) {
-                agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
+                agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", null);
             }
-            if(agvWrkMast.getIoType() == 101){
+            if (agvWrkMast.getIoType() == 101) {
                 //鏇存柊鐩爣搴撲綅鏄庣粏 101.鍑哄簱 鍒犻櫎婧愬簱浣嶅簱瀛樻槑缁�
-                agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvWrkMast.getSourceLocNo()));
+                agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvWrkMast.getSourceLocNo()));
                 //鐢熸垚绌烘澘鍏ュ簱浠诲姟
                 Short containerType = Short.valueOf(agvWrkMast.getBarcode().substring(0, 2));
                 try {
@@ -427,7 +424,7 @@
                     agvBasDevp.setLocSts("R");
                     agvBasDevp.setLocType2(Short.valueOf(agvWrkMast.getBarcode().substring(0, 2)));
                     agvBasDevpService.updateById(agvBasDevp);
-                }catch (Exception e){
+                } catch (Exception e) {
                     e.printStackTrace();
                     log.error(e.getMessage());
                 }
@@ -440,11 +437,11 @@
             //鍒犻櫎AGV宸ヤ綔妗�
             agvWrkMastService.deleteById(wrkNo);
             //鍒犻櫎AGV宸ヤ綔鏄庣粏妗�
-            agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
-            if(!isJSON(orderNo)){
+            agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkNo));
+            if (!isJSON(orderNo)) {
                 //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
-                orderService.checkComplete(orderNo);
-            }else{
+                orderService.checkComplete(orderNo, agvWrkMast.getPltType());
+            } else {
                 List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
                 maps.forEach(map -> {
                     String o = map.get("orderNo").toString();
@@ -485,10 +482,10 @@
             agvWrkMast.setModiTime(new Date());
             agvWrkMastService.updateById(agvWrkMast);
             //淇敼婧愬簱浣嶇姸鎬佷负O
-            agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
-            if(agvWrkMast.getIoType() == 101){
+            agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", null);
+            if (agvWrkMast.getIoType() == 101) {
                 //鏇存柊鐩爣搴撲綅鏄庣粏 101.鍑哄簱 鍒犻櫎婧愬簱浣嶅簱瀛樻槑缁�
-                agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvWrkMast.getSourceLocNo()));
+                agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvWrkMast.getSourceLocNo()));
             }
 
             //鐢熸垚AGV宸ヤ綔鍘嗗彶妗�
@@ -498,15 +495,15 @@
             //鍒犻櫎AGV宸ヤ綔妗�
             agvWrkMastService.deleteById(wrkNo);
             //鍒犻櫎AGV宸ヤ綔鏄庣粏妗�
-            agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
-            if(!isJSON(orderNo)){
+            agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkNo));
+            if (!isJSON(orderNo)) {
                 //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
-                orderService.checkComplete(orderNo);
-            }else{
+                orderService.checkComplete(orderNo, agvWrkMast.getPltType());
+            } else {
                 List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
                 maps.forEach(map -> {
                     String o = map.get("orderNo").toString();
-                    orderService.checkComplete(o);
+                    orderService.checkComplete(o, agvWrkMast.getPltType());
                 });
             }
             //涓婃姤mes
@@ -528,19 +525,19 @@
     @Synchronized
     public ReturnT<String> startPutWayWrk(AgvWrkMast agvWrkMast) throws IOException {
 
-        try{
+        try {
             //涓嬪彂浠诲姟
             int startWrkCode = agvWrkMastService.startWrk(agvWrkMast);
-            if(startWrkCode != 0){
+            if (startWrkCode != 0) {
                 throw new CoolException("浠诲姟涓嬪彂澶辫触");
             }
 
             agvWrkMast.setWrkSts(202L);
             agvWrkMast.setModiTime(new Date());
             agvWrkMastService.updateById(agvWrkMast);
-            if(agvWrkMast.getIoType() == 1){
+            if (agvWrkMast.getIoType() == 1) {
                 //淇敼AGV鍏ュ簱閫氱煡妗g姸鎬佸叆鍑虹姸鎬佷负Y
-                agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(),"Y");
+                agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(), "Y");
             }
             return SUCCESS;
         } catch (Exception e) {
@@ -553,16 +550,16 @@
     @Transactional
     @Synchronized
     public ReturnT<String> startAllcationIn(AgvWrkMast agvWrkMast) throws IOException {
-        
+
         //涓嬪彂浠诲姟
-        try{
+        try {
             int startWrkCode = agvWrkMastService.startAllcationIn(agvWrkMast);
-            if(startWrkCode != 0){
+            if (startWrkCode != 0) {
                 throw new CoolException("浠诲姟涓嬪彂澶辫触");
             }
             return SUCCESS;
-        }catch (Exception e){
-            log.error("浠诲姟涓嬪彂澶辫触"+e.getMessage());
+        } catch (Exception e) {
+            log.error("浠诲姟涓嬪彂澶辫触" + e.getMessage());
         }
         return FAIL;
 
@@ -601,11 +598,11 @@
             List<Map<String, Object>> devNoMaps = agvBasDevpService.selectDevNoAndNumBystationCode(agvWrkMast.getLocNo());
             //鍙栫涓�涓殏瀛樹綅锛屽苟鏌ヨ鍏舵鏁颁笌閰嶇疆鐨勬鏁板仛姣旇緝
             Map<String, Object> devNoMap = devNoMaps.get(0);
-            if((int)devNoMap.get("num") < maxWrokNum){
+            if ((int) devNoMap.get("num") < maxWrokNum) {
                 agvWrkMast.setLocNo(devNoMap.get("dev_no").toString());
                 agvWrkMast.setModiTime(new Date());
                 agvWrkMastService.updateById(agvWrkMast);
-                log.info("after锛�" + devNoMap.toString()  +  ", wrkNo:" + agvWrkMast.getWrkNo() + ", locNo: " + agvWrkMast.getLocNo());
+                log.info("after锛�" + devNoMap.toString() + ", wrkNo:" + agvWrkMast.getWrkNo() + ", locNo: " + agvWrkMast.getLocNo());
             }
         });
 
@@ -644,10 +641,10 @@
         }
     }
 
-    private List<AgvWrkMast> filter(List<AgvWrkMast> agvWrkMastList){
+    private List<AgvWrkMast> filter(List<AgvWrkMast> agvWrkMastList) {
         return agvWrkMastList.stream().filter(agvWrkMast -> {
             AgvWrkMast agvWrkMastWroking = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", agvWrkMast.getLocNo()));
-            if(!Cools.isEmpty(agvWrkMastWroking) && agvWrkMastWroking.getWrkSts()<=202){
+            if (!Cools.isEmpty(agvWrkMastWroking) && agvWrkMastWroking.getWrkSts() <= 202) {
                 System.out.println("source_loc_no > 1");
                 return false;
             }
@@ -660,7 +657,7 @@
     /*
   鐢熸垚宸ヤ綔妗�
    */
-    private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType, int floor){
+    private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType, int floor) {
         AgvWrkMast wrkMast = new AgvWrkMast();
         //宸ヤ綔鐘舵��
         wrkMast.setWrkSts(wrkSts);
@@ -689,7 +686,7 @@
             throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
         }
 
-        wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no",sourceLocNo).eq("barcode",barcode).orderBy("modi_time",false));
+        wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no", sourceLocNo).eq("barcode", barcode).orderBy("modi_time", false));
 
         return wrkMast;
     }

--
Gitblit v1.9.1