From 23a0da92c1d2e3d046fd6bac53915d5adcf897ac Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 31 七月 2020 14:32:18 +0800
Subject: [PATCH] #商品变物料

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index d1c0950..b0a8b32 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -54,8 +54,8 @@
                 // 绌烘澘鍏ュ簱
                 case 10:
                     // 淇敼搴撲綅鐘舵��=D
-                    if (locMast.getLocType().equals("S") || locMast.getLocType().equals("Q")) {
-                        locMast.setLocType("D");
+                    if (locMast.getLocSts().equals("S") || locMast.getLocSts().equals("Q")) {
+                        locMast.setLocSts("D");
                         locMast.setIoTime(now);
                         locMast.setModiTime(now);
                         if (!locMastService.updateById(locMast)) {
@@ -105,8 +105,8 @@
                         }
                     }
                     // 淇敼搴撲綅鐘舵�� S ====>> F
-                    if (locMast.getLocType().equals("S")) {
-                        locMast.setLocType("F");
+                    if (locMast.getLocSts().equals("S")) {
+                        locMast.setLocSts("F");
                         locMast.setBarcode(wrkMast.getBarcode());
                         locMast.setIoTime(now);
                         locMast.setModiTime(now);
@@ -133,8 +133,8 @@
                         }
                     }
                     // 淇敼搴撲綅鐘舵�� Q ====>> F
-                    if (locMast.getLocType().equals("Q")) {
-                        locMast.setLocType("F");
+                    if (locMast.getLocSts().equals("Q")) {
+                        locMast.setLocSts("F");
                         locMast.setBarcode(wrkMast.getBarcode());
                         locMast.setIoTime(now);
                         locMast.setModiTime(now);
@@ -170,8 +170,8 @@
                         // todo:luxiaotao 3)淇敼鍑哄簱閫氱煡妗� status ==> Y
                     }
                     // 淇敼搴撲綅鐘舵�� Q ====>> F
-                    if (locMast.getLocType().equals("Q")) {
-                        locMast.setLocType("F");
+                    if (locMast.getLocSts().equals("Q")) {
+                        locMast.setLocSts("F");
                         locMast.setBarcode(wrkMast.getBarcode());
                         locMast.setIoTime(now);
                         locMast.setModiTime(now);
@@ -189,8 +189,8 @@
                     }
                     // todo:luxiaotao 3)淇敼鐩樼偣閫氱煡妗� status ==> Y
                     // 淇敼搴撲綅鐘舵�� Q ====>> F
-                    if (locMast.getLocType().equals("Q")) {
-                        locMast.setLocType("F");
+                    if (locMast.getLocSts().equals("Q")) {
+                        locMast.setLocSts("F");
                         locMast.setBarcode(wrkMast.getBarcode());
                         locMast.setIoTime(now);
                         locMast.setModiTime(now);
@@ -202,10 +202,10 @@
                 // 搴撲綅绉昏浆
                 case 11:
                     // 榛樿鐩爣搴撲綅鏄┖鏉�
-                    String locType = "D";
+                    String locSts = "D";
                     // 搴撲綅绉昏浆鍒ゆ柇鏄惁涓虹┖鏉跨Щ杞�
                     if (wrkMast.getEmptyMk().equals("N")) {
-                        locType = "F";
+                        locSts = "F";
                         // 杞Щ搴撳瓨鏄庣粏鏁版嵁: 搴撳瓨鍙� 鐢卞伐浣滄。婧愬簱浣嶅彉涓虹洰鏍囧簱浣�
                         if (!locDetlService.updateLocNo(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {
                             exceptionHandle("搴撲綅绉昏浆 ===>> 杞Щ搴撳瓨鏄庣粏鏁版嵁澶辫触锛沎婧愬簱浣�={0}],[鐩爣搴撲綅={1}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
@@ -216,15 +216,15 @@
                     LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
                     if (null != sourceLoc) {
                         sourceLoc.setBarcode("");
-                        sourceLoc.setLocType("O");
+                        sourceLoc.setLocSts("O");
                         sourceLoc.setModiTime(now);
                         sourceLoc.setIoTime(now);
                         if (!locMastService.updateById(sourceLoc)) {
                             exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLoc={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                         }
                     }
-                    // 淇敼鐩爣搴撲綅鐘舵�� ==> .locType
-                    locMast.setLocType(locType);
+                    // 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
+                    locMast.setLocSts(locSts);
                     locMast.setBarcode(wrkMast.getBarcode());
                     locMast.setIoTime(now);
                     locMast.setModiTime(now);
@@ -272,8 +272,8 @@
                         exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                     }
                     // 淇敼婧愬簱浣嶇姸鎬� R ===>> O
-                    if (locMast.getLocType().equals("R")) {
-                        locMast.setLocType("O");
+                    if (locMast.getLocSts().equals("R")) {
+                        locMast.setLocSts("O");
                         locMast.setBarcode("");
                         locMast.setModiTime(now);
                         locMast.setIoTime(now);
@@ -285,8 +285,8 @@
                 // 绌烘澘鍑哄簱
                 case 110:
                     // 淇敼搴撲綅鐘舵�� R ===>> O
-                    if (locMast.getLocType().equals("R")) {
-                        locMast.setLocType("O");
+                    if (locMast.getLocSts().equals("R")) {
+                        locMast.setLocSts("O");
                         locMast.setBarcode("");
                         locMast.setModiTime(now);
                         locMast.setIoTime(now);

--
Gitblit v1.9.1