From 00b9c782322ad546dd6bd37e6ee27f357557a676 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 24 七月 2020 15:46:57 +0800
Subject: [PATCH] #当前本版十分完美、冻结
---
src/main/webapp/views/locMast/locMast.html | 48 ++
src/main/webapp/views/locMast/locMast_detail.html | 2
src/main/java/com/zy/asrs/controller/LocMastController.java | 6
src/main/java/com/zy/asrs/entity/BasDevp.java | 390 +++------------------------
src/main/resources/mapper/LocMastMapper.xml | 3
src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java | 35 ++
src/main/webapp/static/js/locMast/locMast.js | 11
src/main/java/com/zy/asrs/entity/LocMast.java | 334 +++--------------------
src/main/resources/mapper/BasDevpMapper.xml | 3
9 files changed, 186 insertions(+), 646 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index cae4250..a2a3819 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -184,9 +184,9 @@
locMast.setBay1(b); // 鍒�
locMast.setLev1(l); // 灞�
locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
- if (null != param.getWhsType()) {
- locMast.setWhsType(Long.valueOf(param.getWhsType()));
- }
+ locMast.setLocType1(param.getLocType1());
+ locMast.setLocType2(param.getLocType2());
+ locMast.setLocType3(param.getLocType3());
locMast.setAppeUser(getUserId());
locMast.setAppeTime(new Date());
locMast.setModiUser(getUserId());
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index f4952b8..78ca14c 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -9,11 +9,13 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+@Data
@TableName("asr_bas_devp")
public class BasDevp implements Serializable {
@@ -149,6 +151,18 @@
@TableField("out_ok")
private String outOk;
+ @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
+ @TableField("loc_type1")
+ private Short locType1;
+
+ @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
+ @TableField("loc_type2")
+ private Short locType2;
+
+ @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
+ @TableField("loc_type3")
+ private Short locType3;
+
/**
* 淇敼浜哄憳
*/
@@ -200,251 +214,6 @@
@TableField("cart_pos")
private Integer cartPos;
- public BasDevp() {}
-
- public BasDevp(String decDesc,String devMk,String inEnable,String outEnable,String autoing,String loading,String canining,String canouting,String fronting,String rearing,String uping,String downing,String inreq1,String inreq2,Integer wrkNo,Integer wrkNo1,Integer ctnType,String barcode,Integer inQty,Integer row1,Date ioTime,String area,String inOk,String outOk,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Double stdQty,Double minWt,Double maxWt,Double grossWt,Integer cartPos) {
- this.decDesc = decDesc;
- this.devMk = devMk;
- this.inEnable = inEnable;
- this.outEnable = outEnable;
- this.autoing = autoing;
- this.loading = loading;
- this.canining = canining;
- this.canouting = canouting;
- this.fronting = fronting;
- this.rearing = rearing;
- this.uping = uping;
- this.downing = downing;
- this.inreq1 = inreq1;
- this.inreq2 = inreq2;
- this.wrkNo = wrkNo;
- this.wrkNo1 = wrkNo1;
- this.ctnType = ctnType;
- this.barcode = barcode;
- this.inQty = inQty;
- this.row1 = row1;
- this.ioTime = ioTime;
- this.area = area;
- this.inOk = inOk;
- this.outOk = outOk;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.stdQty = stdQty;
- this.minWt = minWt;
- this.maxWt = maxWt;
- this.grossWt = grossWt;
- this.cartPos = cartPos;
- }
-
-// BasDevp basDevp = new BasDevp(
-// null, // 璁惧鎻忚堪
-// null, // 澶囨敞
-// null, // 鍙叆
-// null, // 鍙嚭
-// null, // 鑷姩
-// null, // 鏈夌墿
-// null, // 鑳藉叆
-// null, // 鑳藉嚭
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 闇�姹�1
-// null, // 闇�姹�2
-// null, // 宸ヤ綔鍙�
-// null, //
-// null, // 瀹瑰櫒绫诲瀷
-// null, // 鏉″舰鐮�
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null, //
-// null, //
-// null, //
-// null, // 閲嶉噺
-// null //
-// );
-
- public Integer getDevNo() {
- return devNo;
- }
-
- public void setDevNo(Integer devNo) {
- this.devNo = devNo;
- }
-
- public String getDecDesc() {
- return decDesc;
- }
-
- public void setDecDesc(String decDesc) {
- this.decDesc = decDesc;
- }
-
- public String getDevMk() {
- return devMk;
- }
-
- public void setDevMk(String devMk) {
- this.devMk = devMk;
- }
-
- public String getInEnable() {
- return inEnable;
- }
-
- public void setInEnable(String inEnable) {
- this.inEnable = inEnable;
- }
-
- public String getOutEnable() {
- return outEnable;
- }
-
- public void setOutEnable(String outEnable) {
- this.outEnable = outEnable;
- }
-
- public String getAutoing() {
- return autoing;
- }
-
- public void setAutoing(String autoing) {
- this.autoing = autoing;
- }
-
- public String getLoading() {
- return loading;
- }
-
- public void setLoading(String loading) {
- this.loading = loading;
- }
-
- public String getCanining() {
- return canining;
- }
-
- public void setCanining(String canining) {
- this.canining = canining;
- }
-
- public String getCanouting() {
- return canouting;
- }
-
- public void setCanouting(String canouting) {
- this.canouting = canouting;
- }
-
- public String getFronting() {
- return fronting;
- }
-
- public void setFronting(String fronting) {
- this.fronting = fronting;
- }
-
- public String getRearing() {
- return rearing;
- }
-
- public void setRearing(String rearing) {
- this.rearing = rearing;
- }
-
- public String getUping() {
- return uping;
- }
-
- public void setUping(String uping) {
- this.uping = uping;
- }
-
- public String getDowning() {
- return downing;
- }
-
- public void setDowning(String downing) {
- this.downing = downing;
- }
-
- public String getInreq1() {
- return inreq1;
- }
-
- public void setInreq1(String inreq1) {
- this.inreq1 = inreq1;
- }
-
- public String getInreq2() {
- return inreq2;
- }
-
- public void setInreq2(String inreq2) {
- this.inreq2 = inreq2;
- }
-
- public Integer getWrkNo() {
- return wrkNo;
- }
-
- public void setWrkNo(Integer wrkNo) {
- this.wrkNo = wrkNo;
- }
-
- public Integer getWrkNo1() {
- return wrkNo1;
- }
-
- public void setWrkNo1(Integer wrkNo1) {
- this.wrkNo1 = wrkNo1;
- }
-
- public Integer getCtnType() {
- return ctnType;
- }
-
- public void setCtnType(Integer ctnType) {
- this.ctnType = ctnType;
- }
-
- public String getBarcode() {
- return barcode;
- }
-
- public void setBarcode(String barcode) {
- this.barcode = barcode;
- }
-
- public Integer getInQty() {
- return inQty;
- }
-
- public void setInQty(Integer inQty) {
- this.inQty = inQty;
- }
-
- public Integer getRow1() {
- return row1;
- }
-
- public void setRow1(Integer row1) {
- this.row1 = row1;
- }
-
- public Date getIoTime() {
- return ioTime;
- }
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
@@ -453,36 +222,46 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public void setIoTime(Date ioTime) {
- this.ioTime = ioTime;
+ public String getLocType1$() {
+ if (null == this.locType1){ return null; }
+ switch (this.locType1){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "浣庡簱浣�";
+ case 2:
+ return "楂樺簱浣�";
+ default:
+ return String.valueOf(this.locType1);
+ }
}
- public String getArea() {
- return area;
+ public String getLocType2$() {
+ if (null == this.locType2){ return null; }
+ switch (this.locType2){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "绐勫簱浣�";
+ case 2:
+ return "瀹藉簱浣�";
+ default:
+ return String.valueOf(this.locType2);
+ }
}
- public void setArea(String area) {
- this.area = area;
- }
-
- public String getInOk() {
- return inOk;
- }
-
- public void setInOk(String inOk) {
- this.inOk = inOk;
- }
-
- public String getOutOk() {
- return outOk;
- }
-
- public void setOutOk(String outOk) {
- this.outOk = outOk;
- }
-
- public Long getModiUser() {
- return modiUser;
+ public String getLocType3$() {
+ if (null == this.locType3){ return null; }
+ switch (this.locType3){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "杞诲簱浣�";
+ case 2:
+ return "閲嶅簱浣�";
+ default:
+ return String.valueOf(this.locType3);
+ }
}
public String getModiUser$(){
@@ -494,27 +273,11 @@
return null;
}
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return modiTime;
- }
-
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
- }
-
- public Long getAppeUser() {
- return appeUser;
}
public String getAppeUser$(){
@@ -526,64 +289,11 @@
return null;
}
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
- }
-
- public Date getAppeTime() {
- return appeTime;
- }
-
public String getAppeTime$(){
if (Cools.isEmpty(this.appeTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
- public Double getStdQty() {
- return stdQty;
- }
-
- public void setStdQty(Double stdQty) {
- this.stdQty = stdQty;
- }
-
- public Double getMinWt() {
- return minWt;
- }
-
- public void setMinWt(Double minWt) {
- this.minWt = minWt;
- }
-
- public Double getMaxWt() {
- return maxWt;
- }
-
- public void setMaxWt(Double maxWt) {
- this.maxWt = maxWt;
- }
-
- public Double getGrossWt() {
- return grossWt;
- }
-
- public void setGrossWt(Double grossWt) {
- this.grossWt = grossWt;
- }
-
- public Integer getCartPos() {
- return cartPos;
- }
-
- public void setCartPos(Integer cartPos) {
- this.cartPos = cartPos;
- }
-
}
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 058a853..23d8301 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -11,11 +11,13 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+@Data
@TableName("asr_loc_mast")
public class LocMast implements Serializable {
@@ -87,6 +89,18 @@
@ApiModelProperty(value= "")
@TableField("loc_type")
private String locType;
+
+ @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
+ @TableField("loc_type1")
+ private Short locType1;
+
+ @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
+ @TableField("loc_type2")
+ private Short locType2;
+
+ @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
+ @TableField("loc_type3")
+ private Short locType3;
@ApiModelProperty(value= "")
@TableField("out_enable")
@@ -162,79 +176,6 @@
@TableField("ctn_no")
private String ctnNo;
- public LocMast() {}
-
- public LocMast(Long whsType,Integer pltType,Integer ctnType,String locSts,String sheetNo,Integer crnNo,Integer row1,Integer bay1,Integer lev1,String fullPlt,String locType,String outEnable,Date ioTime,Date firstTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Date errorTime,String errorMemo,Integer ctnKind,Double scWeight,String invWh,String mk,String barcode,String PdcType,String ctnNo) {
- this.whsType = whsType;
- this.pltType = pltType;
- this.ctnType = ctnType;
- this.locSts = locSts;
- this.sheetNo = sheetNo;
- this.crnNo = crnNo;
- this.row1 = row1;
- this.bay1 = bay1;
- this.lev1 = lev1;
- this.fullPlt = fullPlt;
- this.locType = locType;
- this.outEnable = outEnable;
- this.ioTime = ioTime;
- this.firstTime = firstTime;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.errorTime = errorTime;
- this.errorMemo = errorMemo;
- this.ctnKind = ctnKind;
- this.scWeight = scWeight;
- this.invWh = invWh;
- this.mk = mk;
- this.barcode = barcode;
- this.PdcType = PdcType;
- this.ctnNo = ctnNo;
- }
-
-// LocMast locMast = new LocMast(
-// null, // 搴撲綅绫诲瀷
-// null, //
-// null, //
-// null, // [闈炵┖]
-// null, //
-// null, // 鍫嗗灈鏈哄彿(asr_bas_crnp)
-// null, // 鎺�
-// null, // 鍒�
-// null, // 灞�
-// null, // 婊℃澘
-// null, // 搴撲綅鐘舵��
-// null, //
-// null, //
-// null, //
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getLocNo() {
- return locNo;
- }
-
- public void setLocNo(String locNo) {
- this.locNo = locNo;
- }
-
- public Long getWhsType() {
- return whsType;
- }
public String getWhsType$(){
BasWhsService service = SpringUtils.getBean(BasWhsService.class);
@@ -243,86 +184,6 @@
return String.valueOf(basWhs.getWhsDesc());
}
return null;
- }
-
- public void setWhsType(Long whsType) {
- this.whsType = whsType;
- }
-
- public Integer getPltType() {
- return pltType;
- }
-
- public void setPltType(Integer pltType) {
- this.pltType = pltType;
- }
-
- public Integer getCtnType() {
- return ctnType;
- }
-
- public void setCtnType(Integer ctnType) {
- this.ctnType = ctnType;
- }
-
- public String getLocSts() {
- return locSts;
- }
-
- public void setLocSts(String locSts) {
- this.locSts = locSts;
- }
-
- public String getSheetNo() {
- return sheetNo;
- }
-
- public void setSheetNo(String sheetNo) {
- this.sheetNo = sheetNo;
- }
-
- public Integer getCrnNo() {
- return crnNo;
- }
-
- public void setCrnNo(Integer crnNo) {
- this.crnNo = crnNo;
- }
-
- public Integer getRow1() {
- return row1;
- }
-
- public void setRow1(Integer row1) {
- this.row1 = row1;
- }
-
- public Integer getBay1() {
- return bay1;
- }
-
- public void setBay1(Integer bay1) {
- this.bay1 = bay1;
- }
-
- public Integer getLev1() {
- return lev1;
- }
-
- public void setLev1(Integer lev1) {
- this.lev1 = lev1;
- }
-
- public String getFullPlt() {
- return fullPlt;
- }
-
- public void setFullPlt(String fullPlt) {
- this.fullPlt = fullPlt;
- }
-
- public String getLocType() {
- return locType;
}
public String getLocSts$(){
@@ -334,35 +195,11 @@
return null;
}
- public void setLocType(String locType) {
- this.locType = locType;
- }
-
- public String getOutEnable() {
- return outEnable;
- }
-
- public void setOutEnable(String outEnable) {
- this.outEnable = outEnable;
- }
-
- public Date getIoTime() {
- return ioTime;
- }
-
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public void setIoTime(Date ioTime) {
- this.ioTime = ioTime;
- }
-
- public Date getFirstTime() {
- return firstTime;
}
public String getFirstTime$(){
@@ -372,12 +209,46 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.firstTime);
}
- public void setFirstTime(Date firstTime) {
- this.firstTime = firstTime;
+ public String getLocType1$() {
+ if (null == this.locType1){ return null; }
+ switch (this.locType1){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "浣庡簱浣�";
+ case 2:
+ return "楂樺簱浣�";
+ default:
+ return String.valueOf(this.locType1);
+ }
}
- public Long getModiUser() {
- return modiUser;
+ public String getLocType2$() {
+ if (null == this.locType2){ return null; }
+ switch (this.locType2){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "绐勫簱浣�";
+ case 2:
+ return "瀹藉簱浣�";
+ default:
+ return String.valueOf(this.locType2);
+ }
+ }
+
+ public String getLocType3$() {
+ if (null == this.locType3){ return null; }
+ switch (this.locType3){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "杞诲簱浣�";
+ case 2:
+ return "閲嶅簱浣�";
+ default:
+ return String.valueOf(this.locType3);
+ }
}
public String getModiUser$(){
@@ -389,27 +260,11 @@
return null;
}
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return modiTime;
- }
-
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
- }
-
- public Long getAppeUser() {
- return appeUser;
}
public String getAppeUser$(){
@@ -421,27 +276,11 @@
return null;
}
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
- }
-
- public Date getAppeTime() {
- return appeTime;
- }
-
public String getAppeTime$(){
if (Cools.isEmpty(this.appeTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
- public Date getErrorTime() {
- return errorTime;
}
public String getErrorTime$(){
@@ -450,74 +289,5 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
-
- public void setErrorTime(Date errorTime) {
- this.errorTime = errorTime;
- }
-
- public String getErrorMemo() {
- return errorMemo;
- }
-
- public void setErrorMemo(String errorMemo) {
- this.errorMemo = errorMemo;
- }
-
- public Integer getCtnKind() {
- return ctnKind;
- }
-
- public void setCtnKind(Integer ctnKind) {
- this.ctnKind = ctnKind;
- }
-
- public Double getScWeight() {
- return scWeight;
- }
-
- public void setScWeight(Double scWeight) {
- this.scWeight = scWeight;
- }
-
- public String getInvWh() {
- return invWh;
- }
-
- public void setInvWh(String invWh) {
- this.invWh = invWh;
- }
-
- public String getMk() {
- return mk;
- }
-
- public void setMk(String mk) {
- this.mk = mk;
- }
-
- public String getBarcode() {
- return barcode;
- }
-
- public void setBarcode(String barcode) {
- this.barcode = barcode;
- }
-
- public String getPdcType() {
- return PdcType;
- }
-
- public void setPdcType(String PdcType) {
- this.PdcType = PdcType;
- }
-
- public String getCtnNo() {
- return ctnNo;
- }
-
- public void setCtnNo(String ctnNo) {
- this.ctnNo = ctnNo;
- }
-
}
diff --git a/src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java b/src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java
index 7f22809..4f8fb39 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java
@@ -29,8 +29,14 @@
// 鍫嗗灈鏈烘暟閲�
private Integer crnAmount;
- // 搴撲綅绫诲瀷锛� 1锛氫綆搴撲綅 2锛氶珮搴撲綅
- private Integer whsType;
+ // 楂樹綆绫诲瀷锛� 1锛氫綆搴撲綅 2锛氶珮搴撲綅
+ private Short locType1;
+
+ // 瀹界獎绫诲瀷锛� 1锛氱獎搴撲綅 2锛氬搴撲綅
+ private Short locType2;
+
+ // 杞婚噸绫诲瀷锛� 1锛氳交搴撲綅 2锛氶噸搴撲綅
+ private Short locType3;
public Integer getStartRow() {
if (null == startRow) {
@@ -109,11 +115,28 @@
this.crnAmount = crnAmount;
}
- public Integer getWhsType() {
- return whsType;
+ public Short getLocType1() {
+ return locType1;
}
- public void setWhsType(Integer whsType) {
- this.whsType = whsType;
+ public void setLocType1(Short locType1) {
+ this.locType1 = locType1;
}
+
+ public Short getLocType2() {
+ return locType2;
+ }
+
+ public void setLocType2(Short locType2) {
+ this.locType2 = locType2;
+ }
+
+ public Short getLocType3() {
+ return locType3;
+ }
+
+ public void setLocType3(Short locType3) {
+ this.locType3 = locType3;
+ }
+
}
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index 0546242..b00be22 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -29,6 +29,9 @@
<result column="area" property="area" />
<result column="in_ok" property="inOk" />
<result column="out_ok" property="outOk" />
+ <result column="loc_type1" property="locType1" />
+ <result column="loc_type2" property="locType2" />
+ <result column="loc_type3" property="locType3" />
<result column="modi_user" property="modiUser" />
<result column="modi_time" property="modiTime" />
<result column="appe_user" property="appeUser" />
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index fea16f2..61d8a3a 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -16,6 +16,9 @@
<result column="lev1" property="lev1" />
<result column="full_plt" property="fullPlt" />
<result column="loc_type" property="locType" />
+ <result column="loc_type1" property="locType1" />
+ <result column="loc_type2" property="locType2" />
+ <result column="loc_type3" property="locType3" />
<result column="out_enable" property="outEnable" />
<result column="io_time" property="ioTime" />
<result column="first_time" property="firstTime" />
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 566de06..2c8959e 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -22,17 +22,17 @@
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
- ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
+ // ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
// ,{field: 'pltType', align: 'center',title: ''}
// ,{field: 'ctnType', align: 'center',title: ''}
// ,{field: 'locSts', align: 'center',title: ''}
// ,{field: 'sheetNo', align: 'center',title: ''}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
- ,{field: 'row1', align: 'center',title: '鎺�'}
- ,{field: 'bay1', align: 'center',title: '鍒�'}
+ ,{field: 'row1', align: 'center',title: '鎺�', sort:true}
+ ,{field: 'bay1', align: 'center',title: '鍒�', sort:true}
,{field: 'lev1', align: 'center',title: '灞�', sort:true}
,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
- var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' disabled table-index='"+row.LAY_TABLE_INDEX+"'";
if(row.fullPlt === 'Y'){html += " checked ";}
html += ">";
return html;
@@ -53,6 +53,9 @@
// ,{field: 'barcode', align: 'center',title: ''}
// ,{field: 'PdcType', align: 'center',title: ''}
// ,{field: 'ctnNo', align: 'center',title: ''}
+ ,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷'}
+ ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
+ ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
]],
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index c5fee86..b736512 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -17,6 +17,7 @@
position: relative;
overflow: visible !important;
}
+
</style>
</head>
<body>
@@ -34,14 +35,18 @@
</div>
</div>
<div class="layui-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="whsType" class="layui-input" name="whs_type" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="whsType$" 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="basWhsQueryBywhsType" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="row1" placeholder="鎺�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="bay1" placeholder="鍒�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="lev1" placeholder="灞�" autocomplete="off">
</div>
</div>
<!-- 寰呮坊鍔� -->
@@ -126,15 +131,38 @@
</div>
<!-- 搴撲綅绫诲瀷 -->
<div class="layui-form-item">
- <label class="layui-form-label">绫诲瀷(閫夊～)</label>
+ <label class="layui-form-label">楂樹綆绫诲瀷</label>
<div class="layui-input-inline">
- <select name="whsType">
+ <select name="locType1">
<option style="display: none"></option>
+ <option value="0">鏈煡</option>
<option value="1">浣庡簱浣�</option>
<option value="2">楂樺簱浣�</option>
</select>
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹界獎绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="locType2">
+ <option style="display: none"></option>
+ <option value="0">鏈煡</option>
+ <option value="1">绐勫簱浣�</option>
+ <option value="2">瀹藉簱浣�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">杞婚噸绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="locType3">
+ <option style="display: none"></option>
+ <option value="0">鏈煡</option>
+ <option value="1">杞诲簱浣�</option>
+ <option value="2">閲嶅簱浣�</option>
+ </select>
+ </div>
+ </div>
<div id="prompt" style="text-indent: 10px;">
<span class="not-null">鍒濆鍖栧簱浣嶅悗灏嗗垹闄ゅ簱瀛樻槑缁嗭紝璇疯皑鎱庢搷浣滐紒</span>
</div>
diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html
index 23be773..2f578ab 100644
--- a/src/main/webapp/views/locMast/locMast_detail.html
+++ b/src/main/webapp/views/locMast/locMast_detail.html
@@ -35,7 +35,7 @@
<input id="locType" class="layui-input" type="text" >
</div>
</div>
- <div class="layui-inline" style="width:80%">
+ <div class="layui-inline" style="width:80%; display: none">
<label class="layui-form-label">搴撲綅绫诲瀷锛�</label>
<div class="layui-input-inline cool-auto-complete">
<input id="whsType" class="layui-input" type="text" style="display: none">
--
Gitblit v1.9.1