From a65699eb74586c6cdd9773a4489ae9accb93e37d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 23 七月 2020 16:22:45 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/locMast/locMast.html                    |   10 --
 src/main/webapp/static/js/pakStore/emptyOut.js                |    4 
 src/main/webapp/views/report/viewLocMap.html                  |    2 
 src/main/java/com/zy/asrs/controller/LocMastController.java   |    6 
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java   |   38 ++++----
 src/main/webapp/static/js/pakStore/stockAdjust.js             |    2 
 src/main/java/com/zy/asrs/entity/ViewLocMapDto.java           |   16 ++--
 src/main/resources/mapper/LocDetlMapper.xml                   |    4 
 src/main/resources/mapper/LocMastMapper.xml                   |    2 
 src/main/java/com/zy/asrs/task/handler/ErrorStockHandler.java |    2 
 src/main/java/com/zy/asrs/controller/MobileController.java    |    2 
 src/main/webapp/static/js/stoMan/stoQue.js                    |   10 +-
 src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java       |    4 
 src/main/webapp/views/locMast/locMast_detail.html             |   18 +---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java   |   48 ++++++------
 src/main/java/com/zy/asrs/mapper/LocMastMapper.java           |    2 
 src/main/webapp/static/js/locMast/locMast.js                  |   38 ---------
 src/main/java/com/zy/asrs/entity/LocMast.java                 |   11 +-
 18 files changed, 84 insertions(+), 135 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 8b17005..cae4250 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -97,8 +97,8 @@
         }
         LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
         // 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
-        if (oldLocMast.getLocType().equals("R") || oldLocMast.getLocType().equals("F")) {
-            if (locMast.getLocType().equals("O") || locMast.getLocType().equals("D")) {
+        if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
+            if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
                 locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
             }
         }
@@ -179,7 +179,7 @@
                     }
                     LocMast locMast = new LocMast();
                     locMast.setLocNo(locNo);
-                    locMast.setLocType("O");
+                    locMast.setLocSts("O");
                     locMast.setRow1(r); // 鎺�
                     locMast.setBay1(b); // 鍒�
                     locMast.setLev1(l); // 灞�
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 9e8be25..5ba3f32 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -67,7 +67,7 @@
                         @RequestParam(required = false)String matNo){
         if (!Cools.isEmpty(locNo)) {
             LocMast locMast = locMastService.selectById(locNo);
-            if (null == locMast || !"F".equals(locMast.getLocType())) {
+            if (null == locMast || !"F".equals(locMast.getLocSts())) {
                 return R.parse(BaseRes.EMPTY);
             }
             List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 480185d..711fda7 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -44,7 +44,7 @@
     @TableField("ctn_type")
     private Integer ctnType;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "搴撲綅鐘舵��")
     @TableField("loc_sts")
     private String locSts;
 
@@ -84,10 +84,7 @@
     @TableField("full_plt")
     private String fullPlt;
 
-    /**
-     * 搴撲綅鐘舵��
-     */
-    @ApiModelProperty(value= "搴撲綅鐘舵��")
+    @ApiModelProperty(value= "")
     @TableField("loc_type")
     private String locType;
 
@@ -328,9 +325,9 @@
         return locType;
     }
 
-    public String getLocType$(){
+    public String getLocSts$(){
         BasLocTypeService service = SpringUtils.getBean(BasLocTypeService.class);
-        BasLocType basLocType = service.selectById(this.locType);
+        BasLocType basLocType = service.selectById(this.locSts);
         if (!Cools.isEmpty(basLocType)){
             return String.valueOf(basLocType.getLocDesc());
         }
diff --git a/src/main/java/com/zy/asrs/entity/ViewLocMapDto.java b/src/main/java/com/zy/asrs/entity/ViewLocMapDto.java
index 0604530..53fbbc4 100644
--- a/src/main/java/com/zy/asrs/entity/ViewLocMapDto.java
+++ b/src/main/java/com/zy/asrs/entity/ViewLocMapDto.java
@@ -10,7 +10,7 @@
     // 鍒�
     private Integer bay1;
     // 搴撲綅鐘舵��
-    private String locType;
+    private String locSts;
     // 鑳屾櫙鑹�
     private String bgc = "#fff";
     // 瀛椾綋棰滆壊
@@ -19,10 +19,10 @@
     public ViewLocMapDto() {
     }
 
-    public ViewLocMapDto(String locNo, Integer bay1, String locType) {
+    public ViewLocMapDto(String locNo, Integer bay1, String locSts) {
         this.locNo = locNo;
         this.bay1 = bay1;
-        this.locType = locType;
+        this.locSts = locSts;
     }
 
     public String getLocNo() {
@@ -41,13 +41,13 @@
         this.bay1 = bay1;
     }
 
-    public String getLocType() {
-        return locType;
+    public String getLocSts() {
+        return locSts;
     }
 
-    public void setLocType(String locType) {
-        this.locType = locType;
-        switch (locType){
+    public void setLocSts(String locSts) {
+        this.locSts = locSts;
+        switch (locSts){
             case "D":
                 this.bgc = "#00B271";
                 this.color = "#fff";
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 51376b7..57c635b 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -15,7 +15,7 @@
 
     LocMast queryFreeLocMast(@Param("row") Integer row);
 
-    @Select("select loc_no from asr_loc_mast where 1=1 and loc_type = 'O' and crn_no = #{crnNo}")
+    @Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
     List<String> queryGroupEmptyStock(Integer crnNo);
 
 }
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 1df34a7..578ea15 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -27,14 +27,14 @@
 	@Select("select distinct lev1 from asr_loc_mast where row1=#{row1} order by lev1 desc")
 	public List<String> getViewLocLevCount(@Param("row1") int row1);
 //
-	@Select("select loc_no as locNo, bay1,loc_type as locType from asr_loc_mast where row1=#{row1} and lev1=#{lev1} order by bay1")
+	@Select("select loc_no as locNo, bay1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and lev1=#{lev1} order by bay1")
 	public List<ViewLocMapDto> getViewLocBays(@Param("row1") int row1, @Param("lev1") int lev1);
 
 	// 搴撲綅Map
 	@Select("select distinct bay1 from asr_loc_mast where row1=#{row1} order by bay1")
 	public List<String> getViewLocBayCount(@Param("row1") int row1);
 
-	@Select("select lev1,loc_type as locType from asr_loc_mast where row1=#{row1} and bay1=#{bay1} order by bay1")
+	@Select("select lev1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and bay1=#{bay1} order by bay1")
 	public List<ViewLocMapDto> getViewLocLevs(@Param("row1") int row1, @Param("bay1") int bay1);
 
 
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 48f7219..126c0b1 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -109,8 +109,8 @@
         }
         // 鏇存柊鐩爣搴撲綅鐘舵��
         LocMast locMast = locMastService.selectById(dto.getLocNo());
-        if (locMast.getLocType().equals("O")){
-            locMast.setLocType("S"); // S.鍏ュ簱棰勭害
+        if (locMast.getLocSts().equals("O")){
+            locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
             locMast.setModiUser(userId);
             locMast.setModiTime(new Date());
             if (!locMastService.updateById(locMast)){
@@ -227,8 +227,8 @@
             }
             // 淇敼搴撲綅鐘舵��:   F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷f枡/鐩樼偣/骞舵澘鍑哄簱涓�
             locMast = locMastService.selectById(dto.getLocNo());
-            if (locMast.getLocType().equals("F")) {
-                locMast.setLocType(ioType==101?"R":"P");
+            if (locMast.getLocSts().equals("F")) {
+                locMast.setLocSts(ioType==101?"R":"P");
                 locMast.setModiUser(userId);
                 locMast.setModiTime(new Date());
                 if (!locMastService.updateById(locMast)) {
@@ -284,8 +284,8 @@
         }
         // 鏇存柊鐩爣搴撲綅鐘舵��
         LocMast locMast = locMastService.selectById(dto.getLocNo());
-        if (locMast.getLocType().equals("O")){
-            locMast.setLocType("S"); // S.鍏ュ簱棰勭害
+        if (locMast.getLocSts().equals("O")){
+            locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
             locMast.setModiUser(userId);
             locMast.setModiTime(new Date());
             if (!locMastService.updateById(locMast)){
@@ -346,8 +346,8 @@
                 throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
             }
             // 鏇存柊搴撲綅鐘舵�� D.绌烘澘 -> R.鍑哄簱棰勭害
-            if (locMast.getLocType().equals("D")){
-                locMast.setLocType("R");
+            if (locMast.getLocSts().equals("D")){
+                locMast.setLocSts("R");
                 locMast.setModiUser(userId);
                 locMast.setModiTime(new Date());
                 if (!locMastService.updateById(locMast)) {
@@ -411,7 +411,7 @@
         wrkMast.setFullPlt("N"); // 婊℃澘锛歒
         wrkMast.setPicking("N"); // 鎷f枡
         wrkMast.setExitMk("N"); // 閫�鍑�
-        wrkMast.setEmptyMk(sourceLoc.getLocType().equals("D")?"Y":"N"); // 绌烘澘
+        wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 绌烘澘
         wrkMast.setBarcode(sourceLoc.getBarcode()); // 鎵樼洏鐮�
         wrkMast.setLinkMis("N");
         wrkMast.setAppeUser(userId);
@@ -439,26 +439,26 @@
             }
         }
         // 淇敼婧愬簱浣嶇姸鎬�
-        if (sourceLoc.getLocType().equals("D") || sourceLoc.getLocType().equals("F")) {
-            sourceLoc.setLocType("R"); // R.鍑哄簱棰勭害
+        if (sourceLoc.getLocSts().equals("D") || sourceLoc.getLocSts().equals("F")) {
+            sourceLoc.setLocSts("R"); // R.鍑哄簱棰勭害
             sourceLoc.setModiUser(userId);
             sourceLoc.setModiTime(new Date());
             if (!locMastService.updateById(sourceLoc)){
                 throw new CoolException("鏇存柊婧愬簱浣嶇姸鎬佸け璐�");
             }
         } else {
-            throw new CoolException("婧愬簱浣嶅嚭搴撳け璐ワ紝鐘舵�侊細"+sourceLoc.getLocType$());
+            throw new CoolException("婧愬簱浣嶅嚭搴撳け璐ワ紝鐘舵�侊細"+sourceLoc.getLocSts$());
         }
         // 淇敼鐩爣搴撲綅鐘舵��
-        if (loc.getLocType().equals("O")) {
-            loc.setLocType("S"); // S.鍏ュ簱棰勭害
+        if (loc.getLocSts().equals("O")) {
+            loc.setLocSts("S"); // S.鍏ュ簱棰勭害
             loc.setModiTime(new Date());
             loc.setModiUser(userId);
             if (!locMastService.updateById(loc)) {
                 throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
             }
         } else {
-            throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細"+loc.getLocType$());
+            throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細"+loc.getLocSts$());
         }
     }
 
@@ -565,11 +565,11 @@
             throw new CoolException(workNo+"宸ヤ綔妗d笉瀛樺湪");
         }
         String locNo = ""; // 寰呬慨鏀圭洰鏍囧簱浣�
-        String locType = ""; // 寰呬慨鏀圭洰鏍囧簱浣嶇姸鎬�
+        String locSts = ""; // 寰呬慨鏀圭洰鏍囧簱浣嶇姸鎬�
         // 鍏ュ簱鍙栨秷锛堜慨鏀圭洰鏍囧簱浣嶏級
         if (wrkMast.getWrkSts() < 4) {
             locNo = wrkMast.getLocNo();
-            locType = "O";
+            locSts = "O";
             /**
              * 搴撲綅杞Щ
              * 鍙栨秷鍚� 婧愬簱浣� ==>> F.鍦ㄥ簱
@@ -581,7 +581,7 @@
                 if (Cools.isEmpty(locMast)) {
                     throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛屾簮搴撲綅涓嶅瓨鍦�:"+ wrkMast.getSourceLocNo());
                 }
-                locMast.setLocType("F");
+                locMast.setLocSts("F");
                 locMast.setModiTime(new Date());
                 locMast.setModiUser(userId);
                 locMastService.updateById(locMast);
@@ -591,19 +591,19 @@
             locNo = wrkMast.getSourceLocNo();
             // 鍑哄簱 ===>> F.鍦ㄥ簱
             if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {
-                locType = "F";
+                locSts = "F";
             // 绌烘澘鍑哄簱 ===>> D.绌烘《/绌烘爤鏉�
             } else if (wrkMast.getIoType() == 110) {
-                locType = "D";
+                locSts = "D";
             // 搴撲綅杞Щ ===>> D.绌烘《/绌烘爤鏉�
             } else if (wrkMast.getIoType() == 11) {
-                locType = "F";
+                locSts = "F";
                 // 搴撲綅杞Щ锛氱洰鏍囧簱浣�
                 LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
                 if (Cools.isEmpty(locMast)) {
                     throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛岀洰鏍囧簱浣嶄笉瀛樺湪:"+ wrkMast.getSourceLocNo());
                 }
-                locMast.setLocType("O");
+                locMast.setLocSts("O");
                 locMast.setModiTime(new Date());
                 locMast.setModiUser(userId);
                 locMastService.updateById(locMast);
@@ -620,7 +620,7 @@
         if (Cools.isEmpty(locMast)) {
             throw new CoolException("鍙栨秷宸ヤ綔妗eけ璐ワ紝搴撲綅涓嶅瓨鍦�:"+ locNo);
         }
-        locMast.setLocType(locType);
+        locMast.setLocSts(locSts);
         locMast.setModiTime(new Date());
         locMast.setModiUser(userId);
         boolean locMastRes = locMastService.updateById(locMast);
@@ -677,7 +677,7 @@
         }
         // 淇敼搴撲綅鐘舵�� Q.鎷f枡/鐩樼偣/骞舵澘鍐嶅叆搴�
         LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
-        locMast.setLocType("Q");
+        locMast.setLocSts("Q");
         locMast.setModiTime(new Date());
         locMast.setModiUser(userId);
         if (!locMastService.updateById(locMast)) {
diff --git a/src/main/java/com/zy/asrs/task/handler/ErrorStockHandler.java b/src/main/java/com/zy/asrs/task/handler/ErrorStockHandler.java
index 85cc3fa..c0e231d 100644
--- a/src/main/java/com/zy/asrs/task/handler/ErrorStockHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ErrorStockHandler.java
@@ -23,7 +23,7 @@
     @Transactional
     public ReturnT<String> start() {
         try {
-            String sql = "SELECT distinct a.loc_no as locNo FROM asr_loc_mast a,asr_loc_detl b where a.loc_no=b.loc_no and (a.loc_type ='O' or a.loc_type ='D')";
+            String sql = "SELECT distinct a.loc_no as locNo FROM asr_loc_mast a,asr_loc_detl b where a.loc_no=b.loc_no and (a.loc_sts ='O' or a.loc_sts ='D')";
             List<Map<String, Object>> result = jdbcTemplate.queryForList(sql);
             if (!result.isEmpty()) {
                 for (Map<String, Object> map : result) {
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);
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 5579b59..c900d63 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -54,7 +54,7 @@
             from asr_loc_detl a
             left join asr_loc_mast b on a.loc_no = b.loc_no
             where 1=1
-            and b.loc_type = 'F'
+            and b.loc_sts = 'F'
             <include refid="stockOutCondition"></include>
         ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
     </select>
@@ -65,7 +65,7 @@
         from asr_loc_detl a
         left join asr_loc_mast b on a.loc_no = b.loc_no
         where 1=1
-        and b.loc_type = 'F'
+        and b.loc_sts = 'F'
         <include refid="stockOutCondition"></include>
     </select>
 </mapper>
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 64b64b7..fea16f2 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -36,6 +36,6 @@
     </resultMap>
 
     <select id="queryFreeLocMast" resultMap="BaseResultMap">
-        select top 1 * from asr_loc_mast where row1=#{row} and loc_type='O' order by loc_type desc ,lev1 asc,bay1 asc
+        select top 1 * from asr_loc_mast where row1=#{row} and loc_sts='O' order by loc_sts desc ,lev1 asc,bay1 asc
     </select>
 </mapper>
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index a3dfb23..a7a5278 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -21,7 +21,7 @@
             {type: 'checkbox', fixed: 'left'}
 //            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
             ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
-            ,{field: 'locType$', align: 'center',title: '搴撲綅鐘舵��',width:200}
+            ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
             ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
             // ,{field: 'pltType', align: 'center',title: ''}
             // ,{field: 'ctnType', align: 'center',title: ''}
@@ -286,42 +286,6 @@
                        success: function(layero, index){
                            $.ajax({
                                url: baseUrl+"/basWhs/"+ param +"/auth",
-                               headers: {'token': localStorage.getItem('token')},
-                               method: 'GET',
-                               success: function (res) {
-                                   if (res.code === 200){
-                                       setFormVal(layer.getChildFrame('#detail', index), res.data, true);
-                                       top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
-                                       layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
-                                       layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
-                                       layero.find('iframe')[0].contentWindow.layui.form.render('select');
-                                       layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
-                                   } else if (res.code === 403){
-                                       parent.location.href = "/";
-                                   }else {
-                                       layer.msg(res.msg)
-                                   }
-                               }
-                           })
-                       }
-                   });
-                }
-                break;
-            case 'locType':
-                var param = top.reObject(data).locType;
-                if (param === undefined) {
-                    layer.msg("鏃犳暟鎹�");
-                } else {
-                   layer.open({
-                       type: 2,
-                       title: '搴撲綅璇︽儏',
-                       maxmin: true,
-                       area: [top.detailWidth, top.detailHeight],
-                       shadeClose: false,
-                       content: '../basLocType/basLocType_detail.html',
-                       success: function(layero, index){
-                           $.ajax({
-                               url: baseUrl+"/basLocType/"+ param +"/auth",
                                headers: {'token': localStorage.getItem('token')},
                                method: 'GET',
                                success: function (res) {
diff --git a/src/main/webapp/static/js/pakStore/emptyOut.js b/src/main/webapp/static/js/pakStore/emptyOut.js
index de3963c..9b95c8e 100644
--- a/src/main/webapp/static/js/pakStore/emptyOut.js
+++ b/src/main/webapp/static/js/pakStore/emptyOut.js
@@ -37,7 +37,7 @@
         page: true,
         limit: 16,
         limits: [16, 30, 50, 100, 200, 500],
-        where: {loc_type: "D"},
+        where: {loc_sts: "D"},
         even: true,
         toolbar: '#toolbar',
         defaultToolbar: ['filter'],
@@ -45,7 +45,7 @@
         cols: [[
             {type: 'checkbox', fixed: 'left'}
             ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
-            ,{field: 'locType$', align: 'center',title: '搴撲綅鐘舵��',width:200}
+            ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
             // ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
             ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
             ,{field: 'row1', align: 'center',title: '鎺�'}
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 033861b..1c13b57 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -154,7 +154,7 @@
                 let data = res.data;
                 if (data != null) {
                     $(".retrieve").show();
-                    $("#locMsg").html(locNo + "&nbsp;,搴撲綅鐘舵�侊細" + data.locType$);
+                    $("#locMsg").html(locNo + "&nbsp;,搴撲綅鐘舵�侊細" + data.locSts$);
                     $('.not-retrieve').hide();
                     currLocNo = locNo;
                 } else {
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index bfbe5d5..5913c25 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -26,7 +26,7 @@
         cols: [[
             {type: 'checkbox'}
             ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
-            ,{field: 'locType$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'}
+            ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'}
             ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
             ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
             ,{field: 'row1', align: 'center',title: '鎺�'}
@@ -156,10 +156,10 @@
             // 鏌ョ湅鏄庣粏
             case 'locDetl':
                 // locDetl(data.locNo);
-                if (data.locType.trim() === ''
-                    || data.locType.trim() === 'S'
-                    || data.locType.trim() === 'D'
-                    || data.locType.trim() === 'O')  {
+                if (data.locSts.trim() === ''
+                    || data.locSts.trim() === 'S'
+                    || data.locSts.trim() === 'D'
+                    || data.locSts.trim() === 'O')  {
                     layer.msg("姝ゅ簱浣嶇殑鐘舵�佷笉瀛樺湪鐗╂枡");
                     return;
                 }
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index 2fc2770..c5fee86 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -29,14 +29,8 @@
         </div>
     </div>
     <div class="layui-inline">
-        <div class="layui-input-inline cool-auto-complete">
-            <input id="locType" class="layui-input" name="loc_type" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
-            <input id="locType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="搴撲綅鐘舵��" onfocus=this.blur()>
-            <div class="cool-auto-complete-window">
-                <input class="cool-auto-complete-window-input" data-key="basLocTypeQueryBylocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
-                <select class="cool-auto-complete-window-select" data-key="basLocTypeQueryBylocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
-                </select>
-            </div>
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="loc_sts" placeholder="搴撲綅鐘舵��" autocomplete="off">
         </div>
     </div>
     <div class="layui-inline">
diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html
index bf17a98..e44a71d 100644
--- a/src/main/webapp/views/locMast/locMast_detail.html
+++ b/src/main/webapp/views/locMast/locMast_detail.html
@@ -29,16 +29,10 @@
                 <input id="locNo" class="layui-input" type="text" onkeyup="check(this.id, 'locMast')">
             </div>
         </div>
-        <div class="layui-inline"  style="width:80%;">
-            <label class="layui-form-label"><span class="not-null">*</span>搴撲綅鐘舵�侊細</label>
-            <div class="layui-input-inline cool-auto-complete">
-                <input id="locType" class="layui-input" type="text" style="display: none" lay-verify="required" >
-                <input id="locType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
-                <div class="cool-auto-complete-window">
-                    <input class="cool-auto-complete-window-input" data-key="basLocTypeQueryBylocType" onkeyup="autoLoad(this.getAttribute('data-key'))" >
-                    <select class="cool-auto-complete-window-select" data-key="basLocTypeQueryBylocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
-                    </select>
-                </div>
+        <div class="layui-inline"  style="width:31%;display: none">
+            <label class="layui-form-label"><span class="not-null">*</span>锛�</label>
+            <div class="layui-input-inline">
+                <input id="locType" class="layui-input" type="text" >
             </div>
         </div>
         <div class="layui-inline"  style="width:80%;display: none">
@@ -65,8 +59,8 @@
                 <input id="ctnType" class="layui-input" type="text">
             </div>
         </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label"><span class="not-null">*</span>锛�</label>
+        <div class="layui-inline"  style="width:31%;">
+            <label class="layui-form-label"><span class="not-null">*</span>搴撲綅鐘舵�侊細</label>
             <div class="layui-input-inline">
                 <input id="locSts" class="layui-input" type="text" >
             </div>
diff --git a/src/main/webapp/views/report/viewLocMap.html b/src/main/webapp/views/report/viewLocMap.html
index bcae437..472f21b 100644
--- a/src/main/webapp/views/report/viewLocMap.html
+++ b/src/main/webapp/views/report/viewLocMap.html
@@ -89,7 +89,7 @@
         {{#each body}}
         <tr>
             {{#each loc}}
-                <td class="a-loc" title="{{locNo}}" onclick="locDetl(this)" style="background-color:{{bgc}};color:{{color}}">{{locType}}</td>
+                <td class="a-loc" title="{{locNo}}" onclick="locDetl(this)" style="background-color:{{bgc}};color:{{color}}">{{locSts}}</td>
             {{/each}}
         </tr>
         {{/each}}

--
Gitblit v1.9.1