From 71c8b222a56c0f9d1a15c2e5717989598ada70d5 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 09 九月 2024 12:06:23 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java |  495 +++++++++++++++++++++++++++++-------------------
 src/main/java/com/zy/common/web/WcsController.java         |   57 -----
 src/main/webapp/static/js/common.js                        |    2 
 pom.xml                                                    |    2 
 src/main/java/com/zy/common/service/CommonService.java     |   20 -
 src/main/java/com/zy/asrs/task/MoveLocScheduler.java       |    3 
 src/main/resources/application.yml                         |    6 
 7 files changed, 307 insertions(+), 278 deletions(-)

diff --git a/pom.xml b/pom.xml
index f0ed9d9..f45f477 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
     </dependencies>
 
     <build>
-        <finalName>fnwms</finalName>
+        <finalName>tlfwms</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/task/MoveLocScheduler.java b/src/main/java/com/zy/asrs/task/MoveLocScheduler.java
index da5e068..f868667 100644
--- a/src/main/java/com/zy/asrs/task/MoveLocScheduler.java
+++ b/src/main/java/com/zy/asrs/task/MoveLocScheduler.java
@@ -22,12 +22,11 @@
     private LocMastService locMastService;
 
     /**
-     *
+     *  寰呮祴搴撲綅鑷姩绉诲叆娴嬭瘯搴撲綅锛屽畬鎴愬簱浣嶈嚜鍔ㄧ敓鎴愮Щ搴撳埌涓浆搴撲綅
      */
     @Scheduled(cron = "0/3 * * * * ? ")
     private void execute() {
         if (confirmDeep) return;
-
         ReturnT<String> result = moveLocHandler.start();
         if (!result.isSuccess()) {
             log.error("娴嬭瘯瀹屾垚绉诲簱澶辫触");
diff --git a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
index 894a7c1..9bbc6a8 100644
--- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.DateUtils;
+import com.core.common.R;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.CombParam;
@@ -59,133 +60,56 @@
 
     @Transactional
     public ReturnT<String> start() {
-        //娴嬭瘯澶辫触锛圢G锛夌Щ搴�
-        try {
-            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
-                    .eq("loc_sts", "F")
-                    .eq("pack_status", 4)//娴嬭瘯澶辫触
-                    .eq("row1", equipmentRow)
-                    .eq("loc_type1", (short) 1)
-                    .eq("fire_status",0)
-            );
-            if (!Cools.isEmpty(locMasts)){
-                for (LocMast locMast:locMasts){
-                    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
-                    if (Cools.isEmpty(locDetl)){
-                        log.error("娴嬭瘯澶辫触锛圢G锛夌Щ搴�==>搴撳瓨鏄庣粏鏌ヨ澶辫触锛佸簱浣嶅彿锛�"+locMast.getLocNo());
-                        continue;
-                    }
-                    TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
-                            .eq("loc_no",locMast.getLocNo())
-                            .eq("barcode",locDetl.getMatnr())
-                            .eq("status",4)//瀹屾垚娴嬭瘯
-                    );
-                    if (!Cools.isEmpty(testMast)){
-                        if (testMast.getStatus()==4){
-                            //绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
-                            LocMast targetLocNo = locMastService.queryFreeLocMast(2,(short)4);
-                            if (Cools.isEmpty(targetLocNo)){
-                                targetLocNo=locMastService.queryFreeLocMast(1,(short)4);
-                            }
-                            if (targetLocNo != null){
-                                workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt("9935"));
-                                //4.娴嬭瘯瀹屾垚涓婃姤
-                                CombParam combParam = new CombParam();
-                                combParam.setPackNo(locDetl.getMatnr());
-                                combParam.setLocNo(locMast.getLocNo());
-                                combParam.setPackSts(2);
-                                combParam.setStepSts(4);
-                                combParam.setRequestTime(DateUtils.convert(new Date()));
-                                new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
-                                return SUCCESS;
-                            }else {
-                                log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->娌℃湁绌哄簱浣�!");
-                            }
-                        }else if (testMast.getStatus()!=4) {
-                            log.error("娴嬭瘯鐘舵�佸紓甯�,搴撲綅鍙蜂负锛�" + testMast.getLocNo());
-                        }
-                    }else {
-                        log.error("娴嬭瘯搴撲綅锛�"+locMast.getLocNo()+"鎵�灞炴祴璇曟。涓虹┖鎴栬�呬笉鐘舵�佷负4");
-                    }
-                }
-            }
-        } catch (Exception e) {
-            log.error(""+e);
-//            e.printStackTrace();
-//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-//            return FAIL.setMsg(e.getMessage());
-        }
-
-        //娴嬭瘯鎴愬姛 鍑哄簱銆佺Щ搴�
+        //娴嬭瘯鎴愬姛,绉诲簱
         try {
             List<LocMast> locMasts2 = locMastService.selectList(new EntityWrapper<LocMast>()
                     .eq("loc_sts", "F")
                     .eq("pack_status", 3)//娴嬭瘯瀹屾垚
                     .eq("row1", equipmentRow)
                     .eq("loc_type1", (short) 1)
-                    .eq("fire_status",0)
+                    .eq("fire_status", 0)
             );
-            if (!Cools.isEmpty(locMasts2)){
-                for (LocMast locMast:locMasts2){
+            if (!Cools.isEmpty(locMasts2)) {
+                for (LocMast locMast : locMasts2) {
                     LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
-                    if (Cools.isEmpty(locDetl)){
-                        log.error("娴嬭瘯鎴愬姛 鍑哄簱銆佺Щ搴�==>搴撳瓨鏄庣粏鏌ヨ澶辫触锛佸簱浣嶅彿锛�"+locMast.getLocNo());
+                    if (Cools.isEmpty(locDetl)) {
+                        log.error("娴嬭瘯鎴愬姛 鍑哄簱銆佺Щ搴�==>搴撳瓨鏄庣粏鏌ヨ澶辫触锛佸簱浣嶅彿锛�" + locMast.getLocNo());
                         continue;
                     }
                     TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
-                            .eq("loc_no",locMast.getLocNo())
-                            .eq("barcode",locDetl.getMatnr())
-                            .eq("status",4)
+                            .eq("loc_no", locMast.getLocNo())
+                            .eq("barcode", locDetl.getMatnr())
+                            .eq("status", 4)
                     );
-                    boolean sign=false;
-                    if (!Cools.isEmpty(testMast)){
-                        if (testMast.getStatus()==4){
-                            boolean signCrn1 = basCrnpService.checkSiteError(1, false);
-                            if (!signCrn1){
-                                log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->1鍙峰爢鍨涙満涓嶅彲鍑哄簱!");
-                                break;
-                            }
+                    boolean sign = false;
+                    if (!Cools.isEmpty(testMast)) {
+                        if (testMast.getStatus() == 4) {
                             //绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
-                            LocMast targetLocNo = locMastService.queryFreeLocMast(4,(short)2);
-                            if (Cools.isEmpty(targetLocNo)){
-                                targetLocNo=locMastService.queryFreeLocMast(3,(short)2);
-                            }
-                            boolean signCrn2 = basCrnpService.checkSiteError(2, true);
-                            if (!signCrn2){
-                                targetLocNo = null;
-                                log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->2鍙峰爢鍨涙満涓嶅彲鍏ュ簱! 寮�濮嬫煡鎵�1鍙峰爢鍨涙満");
-                            }
-                            if (targetLocNo != null){
-                                //鐢熸垚鍑哄簱浠诲姟
-                                if (outLoc(locMast)){
-                                    sign=true;
-                                }
-                            }else {
-                                signCrn1 = basCrnpService.checkSiteError(1, true);
-                                if (!signCrn1){
-                                    log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->1鍙峰爢鍨涙満涓嶅彲鍏ュ簱!");
-                                    break;
-                                }
-                                //3\4鎺掓弧  鍚�2鎺掔Щ搴擄紝鏌ヨ鐩爣搴撲綅
-                                targetLocNo = locMastService.queryFreeLocMast(2,(short)2);
-                                if (Cools.isEmpty(targetLocNo)){
-                                    targetLocNo=locMastService.queryFreeLocMast(1,(short)2);
-                                }
-                                if (targetLocNo != null){
-                                    workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)9935);
-                                    sign=true;
-                                }else {
-                                    log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->娌℃湁绌哄簱浣�!");
+                            LocMast targetLocNo = locMastService.queryFreeLocMast(3, (short) 2);
+                            if (Cools.isEmpty(targetLocNo)) {
+                                targetLocNo = locMastService.queryFreeLocMast(2, (short) 2);
+                                if (Cools.isEmpty(targetLocNo)) {
+                                    targetLocNo = locMastService.queryFreeLocMast(1, (short) 2);
+                                    if (Cools.isEmpty(targetLocNo)) {
+                                        return FAIL.setMsg("娌℃湁涓浆搴撲綅");
+                                    }
                                 }
                             }
-                        }else if (testMast.getStatus()!=4) {
+                            if (targetLocNo != null) {
+                                workService.locMove(locMast.getLocNo(), targetLocNo.getLocNo(), (long) 9935);
+                                sign = true;
+                            } else {
+                                log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->娌℃湁绌哄簱浣�!");
+                            }
+
+                        } else if (testMast.getStatus() != 4) {
                             log.error("娴嬭瘯鐘舵�佸紓甯�,搴撲綅鍙蜂负锛�" + testMast.getLocNo());
                         }
 
-                    }else {
-                        log.error("娴嬭瘯搴撲綅锛�"+locMast.getLocNo()+"鎵�灞炴祴璇曟。涓虹┖鎴栬�呬笉鐘舵�佷负4");
+                    } else {
+                        log.error("娴嬭瘯搴撲綅锛�" + locMast.getLocNo() + "鎵�灞炴祴璇曟。涓虹┖鎴栬�呬笉鐘舵�佷负4");
                     }
-                    if (sign){
+                    if (sign) {
                         //4.娴嬭瘯瀹屾垚涓婃姤
                         CombParam combParam = new CombParam();
                         combParam.setPackNo(locDetl.getMatnr());
@@ -193,122 +117,297 @@
                         combParam.setPackSts(1);
                         combParam.setStepSts(4);
                         combParam.setRequestTime(DateUtils.convert(new Date()));
-                        new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+                        new PostMesDataUtils().postMesData("MES绯荤粺", mesUrl, inpath, combParam);
                         return SUCCESS;
                     }
                 }
             }
         } catch (Exception e) {
-            log.error(""+e);
-//            e.printStackTrace();
-//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-//            return FAIL.setMsg(e.getMessage());
+            log.error("" + e);
         }
-
         //娴嬭瘯鏈夌┖搴撲綅 绉诲簱
         try {
             List<LocMast> locMasts3 = locMastService.selectList(new EntityWrapper<LocMast>()
                     .eq("loc_sts", "F")
                     .eq("pack_status", 0)
                     .eq("loc_type1", (short) 3)
-                    .eq("fire_status",0)
-                    .orderBy("io_time",true)
+                    .eq("fire_status", 0)
+                    .orderBy("io_time", true)
             );
-            if (!Cools.isEmpty(locMasts3)){
-                for (LocMast locMast:locMasts3){
+            if (!Cools.isEmpty(locMasts3)) {
+                for (LocMast locMast : locMasts3) {
                     boolean signCrn1 = basCrnpService.checkSiteError(1, true);
-                    if (!signCrn1){
+                    if (!signCrn1) {
                         log.error("鍚戞祴璇曞簱浣嶇Щ搴撳け璐�---->1鍙峰爢鍨涙満涓嶅彲鐢�!");
                         break;
                     }
                     //绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
-                    LocMast targetLocNo = locMastService.queryFreeLocMast(equipmentRow,(short)1);
-                    if (targetLocNo != null){
-                        workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)9999);
-                    }else {
+                    LocMast targetLocNo = locMastService.queryFreeLocMast(equipmentRow, (short) 1);
+                    if (targetLocNo != null) {
+                        workService.locMove(locMast.getLocNo(), targetLocNo.getLocNo(), (long) 9999);
+                    } else {
 //                        log.error("鍚戞祴璇曞簱浣嶇Щ搴撳け璐�--->绛夊緟绌哄簱浣�!");
                     }
                 }
             }
         } catch (Exception e) {
-            log.error(""+e);
-//            e.printStackTrace();
-//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-//            return FAIL.setMsg(e.getMessage());
+            log.error("" + e);
         }
         return SUCCESS;
     }
 
-    public boolean outLoc(LocMast locMast){
-        try {
-            Date now = new Date();
-            Integer ioType = 101;   //鍏ュ嚭搴撶被鍨�
-            LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
-            if (Cools.isEmpty(locDetl)){
-                log.error("搴撲綅:"+locMast.getLocNo()+"娌℃湁鏄庣粏");
-            } else if (Cools.isEmpty(locDetl.getDeadWarn())){
-                log.error("搴撲綅:"+locMast.getLocNo()+"娌℃湁闈欑疆鏃堕棿");
-            } else if (Cools.isEmpty(locMast.getModiTime())){
-                log.error("搴撲綅:"+locMast.getLocNo()+"modiTime涓虹┖");
-            } else if (Cools.isEmpty(locMast.getBarcode())){
-                log.error("搴撲綅:"+locMast.getLocNo()+"鎵樼洏鐮佷负绌�");
-            } else {
-                // 鐢熸垚宸ヤ綔鍙�
-                int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
-                // 鐢熸垚宸ヤ綔妗�
-                WrkMast wrkMast = new WrkMast();
-                wrkMast.setWrkNo(workNo);
-                wrkMast.setIoTime(now);
-                wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
-                wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
-                wrkMast.setIoPri(13D); // 浼樺厛绾э細13
-                wrkMast.setCrnNo(1);
-                wrkMast.setSourceStaNo(203); // 婧愮珯
-                wrkMast.setStaNo(206); // 鐩爣绔�  2鍙峰爢鍨涙満鍏ュ簱绔�
-                wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
-                wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
-                wrkMast.setPicking("N"); // 鎷f枡
-                wrkMast.setExitMk("N"); // 閫�鍑�
-                wrkMast.setEmptyMk("N"); // 绌烘澘
-                wrkMast.setLinkMis("N");
-                wrkMast.setBarcode(locMast.getBarcode());
-                wrkMast.setAppeTime(now);
-                wrkMast.setModiTime(now);
-                if (!wrkMastService.insert(wrkMast)) {
-                    log.error("淇濆瓨宸ヤ綔妗eけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+locMast.getLocNo());
-                    return false;
-                }
-                // 鐢熸垚宸ヤ綔妗f槑缁�
-                WrkDetl wrkDetl = new WrkDetl();
-                wrkDetl.sync(locDetl);
-                wrkDetl.setWrkNo(workNo);
-                wrkDetl.setIoTime(now);
-                wrkDetl.setAnfme(1.0); // 鏁伴噺
-                wrkDetl.setAppeTime(now);
-                wrkDetl.setModiTime(now);
-                if (!wrkDetlService.insert(wrkDetl)) {
-                    log.error("淇濆瓨宸ヤ綔妗f槑缁嗗け璐�");
-                    return false;
-                }
-                // 淇敼搴撲綅鐘舵��:   F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害
-                if (locMast.getLocSts().equals("F")) {
-                    locMast.setLocSts("R");
-                    locMast.setModiTime(now);
-//                    locMast.setPackStatus(5); //5:寮�濮嬮潤缃�
-                    if (!locMastService.updateById(locMast)) {
-                        log.error("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
-                        return false;
-                    }else {
-                        return true;
-                    }
-                } else {
-                    log.error(locMast.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
-                }
-            }
-            return false;
-        } catch (Exception e) {
-            return false;
-        }
-    }
+//    @Transactional
+//    public ReturnT<String> start() {
+//        //娴嬭瘯澶辫触锛圢G锛夌Щ搴�
+//        try {
+//            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+//                    .eq("loc_sts", "F")
+//                    .eq("pack_status", 4)//娴嬭瘯澶辫触
+//                    .eq("row1", equipmentRow)
+//                    .eq("loc_type1", (short) 1)
+//                    .eq("fire_status", 0)
+//            );
+//            if (!Cools.isEmpty(locMasts)) {
+//                for (LocMast locMast : locMasts) {
+//                    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+//                    if (Cools.isEmpty(locDetl)) {
+//                        log.error("娴嬭瘯澶辫触锛圢G锛夌Щ搴�==>搴撳瓨鏄庣粏鏌ヨ澶辫触锛佸簱浣嶅彿锛�" + locMast.getLocNo());
+//                        continue;
+//                    }
+//                    TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
+//                            .eq("loc_no", locMast.getLocNo())
+//                            .eq("barcode", locDetl.getMatnr())
+//                            .eq("status", 4)//瀹屾垚娴嬭瘯
+//                    );
+//                    if (!Cools.isEmpty(testMast)) {
+//                        if (testMast.getStatus() == 4) {
+//                            //绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
+//                            LocMast targetLocNo = locMastService.queryFreeLocMast(2, (short) 4);
+//                            if (Cools.isEmpty(targetLocNo)) {
+//                                targetLocNo = locMastService.queryFreeLocMast(1, (short) 4);
+//                            }
+//                            if (targetLocNo != null) {
+//                                workService.locMove(locMast.getLocNo(), targetLocNo.getLocNo(), (long) Integer.parseInt("9935"));
+//                                //4.娴嬭瘯瀹屾垚涓婃姤
+//                                CombParam combParam = new CombParam();
+//                                combParam.setPackNo(locDetl.getMatnr());
+//                                combParam.setLocNo(locMast.getLocNo());
+//                                combParam.setPackSts(2);
+//                                combParam.setStepSts(4);
+//                                combParam.setRequestTime(DateUtils.convert(new Date()));
+//                                new PostMesDataUtils().postMesData("MES绯荤粺", mesUrl, inpath, combParam);
+//                                return SUCCESS;
+//                            } else {
+//                                log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->娌℃湁绌哄簱浣�!");
+//                            }
+//                        } else if (testMast.getStatus() != 4) {
+//                            log.error("娴嬭瘯鐘舵�佸紓甯�,搴撲綅鍙蜂负锛�" + testMast.getLocNo());
+//                        }
+//                    } else {
+//                        log.error("娴嬭瘯搴撲綅锛�" + locMast.getLocNo() + "鎵�灞炴祴璇曟。涓虹┖鎴栬�呬笉鐘舵�佷负4");
+//                    }
+//                }
+//            }
+//        } catch (Exception e) {
+//            log.error("" + e);
+////            e.printStackTrace();
+////            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+////            return FAIL.setMsg(e.getMessage());
+//        }
+//
+//        //娴嬭瘯鎴愬姛 鍑哄簱銆佺Щ搴�
+//        try {
+//            List<LocMast> locMasts2 = locMastService.selectList(new EntityWrapper<LocMast>()
+//                    .eq("loc_sts", "F")
+//                    .eq("pack_status", 3)//娴嬭瘯瀹屾垚
+//                    .eq("row1", equipmentRow)
+//                    .eq("loc_type1", (short) 1)
+//                    .eq("fire_status", 0)
+//            );
+//            if (!Cools.isEmpty(locMasts2)) {
+//                for (LocMast locMast : locMasts2) {
+//                    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+//                    if (Cools.isEmpty(locDetl)) {
+//                        log.error("娴嬭瘯鎴愬姛 鍑哄簱銆佺Щ搴�==>搴撳瓨鏄庣粏鏌ヨ澶辫触锛佸簱浣嶅彿锛�" + locMast.getLocNo());
+//                        continue;
+//                    }
+//                    TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
+//                            .eq("loc_no", locMast.getLocNo())
+//                            .eq("barcode", locDetl.getMatnr())
+//                            .eq("status", 4)
+//                    );
+//                    boolean sign = false;
+//                    if (!Cools.isEmpty(testMast)) {
+//                        if (testMast.getStatus() == 4) {
+//                            boolean signCrn1 = basCrnpService.checkSiteError(1, false);
+//                            if (!signCrn1) {
+//                                log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->1鍙峰爢鍨涙満涓嶅彲鍑哄簱!");
+//                                break;
+//                            }
+//                            //绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
+//                            LocMast targetLocNo = locMastService.queryFreeLocMast(4, (short) 2);
+//                            if (Cools.isEmpty(targetLocNo)) {
+//                                targetLocNo = locMastService.queryFreeLocMast(3, (short) 2);
+//                            }
+//                            boolean signCrn2 = basCrnpService.checkSiteError(2, true);
+//                            if (!signCrn2) {
+//                                targetLocNo = null;
+//                                log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->2鍙峰爢鍨涙満涓嶅彲鍏ュ簱! 寮�濮嬫煡鎵�1鍙峰爢鍨涙満");
+//                            }
+//                            if (targetLocNo != null) {
+//                                //鐢熸垚鍑哄簱浠诲姟
+//                                if (outLoc(locMast)) {
+//                                    sign = true;
+//                                }
+//                            } else {
+//                                signCrn1 = basCrnpService.checkSiteError(1, true);
+//                                if (!signCrn1) {
+//                                    log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->1鍙峰爢鍨涙満涓嶅彲鍏ュ簱!");
+//                                    break;
+//                                }
+//                                //3\4鎺掓弧  鍚�2鎺掔Щ搴擄紝鏌ヨ鐩爣搴撲綅
+//                                targetLocNo = locMastService.queryFreeLocMast(2, (short) 2);
+//                                if (Cools.isEmpty(targetLocNo)) {
+//                                    targetLocNo = locMastService.queryFreeLocMast(1, (short) 2);
+//                                }
+//                                if (targetLocNo != null) {
+//                                    workService.locMove(locMast.getLocNo(), targetLocNo.getLocNo(), (long) 9935);
+//                                    sign = true;
+//                                } else {
+//                                    log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->娌℃湁绌哄簱浣�!");
+//                                }
+//                            }
+//                        } else if (testMast.getStatus() != 4) {
+//                            log.error("娴嬭瘯鐘舵�佸紓甯�,搴撲綅鍙蜂负锛�" + testMast.getLocNo());
+//                        }
+//
+//                    } else {
+//                        log.error("娴嬭瘯搴撲綅锛�" + locMast.getLocNo() + "鎵�灞炴祴璇曟。涓虹┖鎴栬�呬笉鐘舵�佷负4");
+//                    }
+//                    if (sign) {
+//                        //4.娴嬭瘯瀹屾垚涓婃姤
+//                        CombParam combParam = new CombParam();
+//                        combParam.setPackNo(locDetl.getMatnr());
+//                        combParam.setLocNo(locMast.getLocNo());
+//                        combParam.setPackSts(1);
+//                        combParam.setStepSts(4);
+//                        combParam.setRequestTime(DateUtils.convert(new Date()));
+//                        new PostMesDataUtils().postMesData("MES绯荤粺", mesUrl, inpath, combParam);
+//                        return SUCCESS;
+//                    }
+//                }
+//            }
+//        } catch (Exception e) {
+//            log.error("" + e);
+////            e.printStackTrace();
+////            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+////            return FAIL.setMsg(e.getMessage());
+//        }
+//
+//        //娴嬭瘯鏈夌┖搴撲綅 绉诲簱
+//        try {
+//            List<LocMast> locMasts3 = locMastService.selectList(new EntityWrapper<LocMast>()
+//                    .eq("loc_sts", "F")
+//                    .eq("pack_status", 0)
+//                    .eq("loc_type1", (short) 3)
+//                    .eq("fire_status", 0)
+//                    .orderBy("io_time", true)
+//            );
+//            if (!Cools.isEmpty(locMasts3)) {
+//                for (LocMast locMast : locMasts3) {
+//                    boolean signCrn1 = basCrnpService.checkSiteError(1, true);
+//                    if (!signCrn1) {
+//                        log.error("鍚戞祴璇曞簱浣嶇Щ搴撳け璐�---->1鍙峰爢鍨涙満涓嶅彲鐢�!");
+//                        break;
+//                    }
+//                    //绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
+//                    LocMast targetLocNo = locMastService.queryFreeLocMast(equipmentRow, (short) 1);
+//                    if (targetLocNo != null) {
+//                        workService.locMove(locMast.getLocNo(), targetLocNo.getLocNo(), (long) 9999);
+//                    } else {
+////                        log.error("鍚戞祴璇曞簱浣嶇Щ搴撳け璐�--->绛夊緟绌哄簱浣�!");
+//                    }
+//                }
+//            }
+//        } catch (Exception e) {
+//            log.error("" + e);
+////            e.printStackTrace();
+////            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+////            return FAIL.setMsg(e.getMessage());
+//        }
+//        return SUCCESS;
+//    }
+//
+//    public boolean outLoc(LocMast locMast) {
+//        try {
+//            Date now = new Date();
+//            Integer ioType = 101;   //鍏ュ嚭搴撶被鍨�
+//            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+//            if (Cools.isEmpty(locDetl)) {
+//                log.error("搴撲綅:" + locMast.getLocNo() + "娌℃湁鏄庣粏");
+//            } else if (Cools.isEmpty(locDetl.getDeadWarn())) {
+//                log.error("搴撲綅:" + locMast.getLocNo() + "娌℃湁闈欑疆鏃堕棿");
+//            } else if (Cools.isEmpty(locMast.getModiTime())) {
+//                log.error("搴撲綅:" + locMast.getLocNo() + "modiTime涓虹┖");
+//            } else if (Cools.isEmpty(locMast.getBarcode())) {
+//                log.error("搴撲綅:" + locMast.getLocNo() + "鎵樼洏鐮佷负绌�");
+//            } else {
+//                // 鐢熸垚宸ヤ綔鍙�
+//                int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+//                // 鐢熸垚宸ヤ綔妗�
+//                WrkMast wrkMast = new WrkMast();
+//                wrkMast.setWrkNo(workNo);
+//                wrkMast.setIoTime(now);
+//                wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+//                wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
+//                wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+//                wrkMast.setCrnNo(1);
+//                wrkMast.setSourceStaNo(203); // 婧愮珯
+//                wrkMast.setStaNo(206); // 鐩爣绔�  2鍙峰爢鍨涙満鍏ュ簱绔�
+//                wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
+//                wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+//                wrkMast.setPicking("N"); // 鎷f枡
+//                wrkMast.setExitMk("N"); // 閫�鍑�
+//                wrkMast.setEmptyMk("N"); // 绌烘澘
+//                wrkMast.setLinkMis("N");
+//                wrkMast.setBarcode(locMast.getBarcode());
+//                wrkMast.setAppeTime(now);
+//                wrkMast.setModiTime(now);
+//                if (!wrkMastService.insert(wrkMast)) {
+//                    log.error("淇濆瓨宸ヤ綔妗eけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + locMast.getLocNo());
+//                    return false;
+//                }
+//                // 鐢熸垚宸ヤ綔妗f槑缁�
+//                WrkDetl wrkDetl = new WrkDetl();
+//                wrkDetl.sync(locDetl);
+//                wrkDetl.setWrkNo(workNo);
+//                wrkDetl.setIoTime(now);
+//                wrkDetl.setAnfme(1.0); // 鏁伴噺
+//                wrkDetl.setAppeTime(now);
+//                wrkDetl.setModiTime(now);
+//                if (!wrkDetlService.insert(wrkDetl)) {
+//                    log.error("淇濆瓨宸ヤ綔妗f槑缁嗗け璐�");
+//                    return false;
+//                }
+//                // 淇敼搴撲綅鐘舵��:   F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害
+//                if (locMast.getLocSts().equals("F")) {
+//                    locMast.setLocSts("R");
+//                    locMast.setModiTime(now);
+////                    locMast.setPackStatus(5); //5:寮�濮嬮潤缃�
+//                    if (!locMastService.updateById(locMast)) {
+//                        log.error("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + locMast.getLocNo());
+//                        return false;
+//                    } else {
+//                        return true;
+//                    }
+//                } else {
+//                    log.error(locMast.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+//                }
+//            }
+//            return false;
+//        } catch (Exception e) {
+//            return false;
+//        }
+//    }
 
 }
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index b187200..bfef011 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -102,14 +102,8 @@
     @Transactional
     public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
 
-        if (sourceStaNo.equals(202)) {
-            whsType = 1;
-            locTypeDto.setLocType1((short) 1);
-        } else if (sourceStaNo.equals(206)) {
-            whsType = 2;
-            locTypeDto.setLocType1((short) 2);
-        }
-
+        whsType = 1;
+        locTypeDto.setLocType1((short) 1);
         StartupDto startupDto = new StartupDto();
         RowLastno rowLastno = rowLastnoService.selectById(whsType);
         if (Cools.isEmpty(rowLastno)) {
@@ -126,16 +120,6 @@
         int crnNo = crn_qty;
         // 鐩爣搴撲綅
         LocMast locMast = null;
-
-        crnNo=2;
-        if (curRow == 3) {
-            curRow = 4;
-        } else if (curRow == 4) {
-            curRow = 3;
-        } else {
-            rowCount = 0;
-            crnNo=1;
-        }
 
         if (crnNo == 0) {
             throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 8e622ae..6c5a1ae 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -71,60 +71,7 @@
         if (Cools.isEmpty(param.getBarcode())) {
             return R.error("鎵樼洏鐮佷笉鑳戒负绌�");
         }
-        boolean logs=true;
-        TestMast testMast11=new TestMast();
-        //濡傛灉pack鐮佷负绌猴紝鏌ユ祴璇曡〃
-        if (Cools.isEmpty(param.getPackNo())) {
-            testMast11= testMastService.selectOne(new EntityWrapper<TestMast>()
-                    .eq("user_id",param.getBarcode())//鏌ユ墭鐩樼爜
-                    .eq("status",4));   //瀹屾垚娴嬭瘯
-            logs=false;
-        }else{
-            LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>()
-                    .eq("matnr",param.getPackNo())
-                    .or()
-                    .eq("zpallet",param.getBarcode()));
-            if(!Cools.isEmpty(locDetl)){
-                return R.error("PACK鐮佸湪搴擄紒锛侊紒锛�");
-            }
-
-        }
         Date now = new Date();
-        if (true){
-            try{
-                Mat mat=new Mat();
-                if(logs){
-                    mat = matService.selectByMatnr(param.getPackNo());
-                }else {
-                    mat = matService.selectByMatnr(testMast11.getBarcode());
-                }
-
-                if (Cools.isEmpty(mat)){
-                    return R.error("鍟嗗搧淇℃伅妗f鏈煡璇㈠埌pack淇℃伅"+param.getPackNo());
-                }
-                WaitPakin waitPakin = new WaitPakin();
-                int i = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
-                if(i==0){
-                    waitPakin.setMatnr(mat.getMatnr());// Pack鐮�
-                    waitPakin.setMaktx(mat.getMaktx());
-                    waitPakin.setZpallet(param.getBarcode());   //鎵樼洏鐮�
-                    waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
-                    waitPakin.setAnfme(1.0);  // 鏁伴噺
-                    waitPakin.setStatus("Y");    // 鐘舵��
-                    waitPakin.setManuDate(mat.getManuDate());
-                    waitPakin.setAppeUser(null);
-                    waitPakin.setAppeTime(now);
-                    waitPakin.setModiUser(null);
-                    waitPakin.setModiTime(now);
-                    waitPakin.setDeadWarn(mat.getDeadWarn());
-                    if (!waitPakinService.insert(waitPakin)) {
-                        throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
-                    }
-                }
-            }catch (Exception e){
-
-            }
-        }
         List<WaitPakin> waitPakins = null;
         if (param.getIoType() == 1) {
             if (Cools.isEmpty(param.getBarcode())) {
@@ -154,8 +101,8 @@
 
         // 婧愮珯鐐圭姸鎬佹娴�
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), false);
-//        sourceStaNo.setLocType1(param.getLocType1());
-        sourceStaNo.setLocType1((short)1);
+        sourceStaNo.setLocType1(param.getLocType1());
+//        sourceStaNo.setLocType1((short)1);
         LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
 
         StartupDto dto = null;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c32453d..6af8763 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -12,8 +12,8 @@
     enabled: false
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    #url: jdbc:sqlserver://127.0.0.1:1433;databasename=zjfnasrs
-    url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jxtlfasrs
+#    url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs
     username: sa
     password: sa@123
   mvc:
@@ -46,7 +46,7 @@
 
 #License鐩稿叧閰嶇疆
 license:
-  subject: zjfnasrs
+  subject: jxtlfasrs
   publicAlias: publicCert
   storePass: public_zhongyang_123456789
   licensePath: license.lic
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 322b9e9..aac7d07 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/fnwms";
+var baseUrl = "/tlfwms";
 
 // 璇︽儏绐楀彛-楂樺害
 var detailHeight = '80%';

--
Gitblit v1.9.1