From 9a438731c2bc6262b8a045af651ea534e1c1a253 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 03 八月 2020 10:01:04 +0800
Subject: [PATCH] #嘉善WMS系统
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 4
src/main/resources/mapper/WrkDetlLogMapper.xml | 2
src/main/java/com/zy/asrs/utils/VersionUtils.java | 28 +-----
src/main/webapp/static/js/pakStore/stockAdjust.js | 4
src/main/java/com/zy/asrs/entity/MatCode.java | 56 +++++++-------
src/main/resources/mapper/LocDetlMapper.xml | 2
src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java | 2
src/main/resources/mapper/WrkDetlMapper.xml | 2
src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java | 36 ++++----
src/main/java/com/zy/asrs/entity/LocDetl.java | 4
src/main/java/com/zy/asrs/entity/WrkDetl.java | 4
src/main/java/com/zy/asrs/entity/ViewWorkInBean.java | 2
src/main/webapp/static/js/common.js | 45 ++---------
13 files changed, 74 insertions(+), 117 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 26d40f8..ef2ea78 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -40,8 +40,8 @@
@ApiModelProperty(value= "鐗╂枡绫诲埆")
private String type;
- @ApiModelProperty(value= "鍔╄鐮�")
- private String mnemonic;
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
@ApiModelProperty(value= "渚涘簲鍟�")
private String supplier;
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
index 7cd7f14..9222313 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatCode.java
@@ -43,88 +43,88 @@
/**
* 鐗╂枡鍗曚綅
*/
- @ApiModelProperty(value= "鍩烘湰鍗曚綅")
+ @ApiModelProperty(value= "鐗╂枡鍗曚綅")
private String str1;
- @ApiModelProperty(value= "鐗╂枡绫诲埆")
+ @ApiModelProperty(value= "鐗╂枡瑙勬牸")
private String str2;
- @ApiModelProperty(value= "瑙勬牸鍨嬪彿")
+ @ApiModelProperty(value= "棰滆壊")
private String str3;
- @ApiModelProperty(value= "鐘舵��")
+ @ApiModelProperty(value= "瀹㈡埛")
private String str4;
- @ApiModelProperty(value= "鍔╄鐮�")
+ @ApiModelProperty(value= "")
private String str5;
- @ApiModelProperty(value= "榛樿渚涘簲鍟�")
+ @ApiModelProperty(value= "")
private String str6;
- @ApiModelProperty(value= "榛樿浠撳簱")
+ @ApiModelProperty(value= "")
private String str7;
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "")
private String str8;
- @ApiModelProperty(value= "閲囪喘鍛�")
+ @ApiModelProperty(value= "")
private String str9;
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value= "")
private String str10;
- @ApiModelProperty(value= "搴忓垪鍙风鐞�")
+ @ApiModelProperty(value= "")
private String str11;
- @ApiModelProperty(value= "鎵规绠＄悊")
+ @ApiModelProperty(value= "")
private String str12;
- @ApiModelProperty(value= "淇濊川鏈熷崟浣�")
+ @ApiModelProperty(value= "")
private String str13;
- @ApiModelProperty(value= "淇濊川鏈熺鐞�")
+ @ApiModelProperty(value= "")
private String str14;
- @ApiModelProperty(value= "淇濊川鏈�")
+ @ApiModelProperty(value= "")
private String str15;
- @ApiModelProperty(value= "鍙攢鍞�")
+ @ApiModelProperty(value= "")
private String str16;
- @ApiModelProperty(value= "鍙噰璐�")
+ @ApiModelProperty(value= "")
private String str17;
- @ApiModelProperty(value= "鍙负瀛愪欢")
+ @ApiModelProperty(value= "")
private String str18;
- @ApiModelProperty(value= "鍙负缁勪欢")
+ @ApiModelProperty(value= "")
private String str19;
- @ApiModelProperty(value= "杈呭姪灞炴�х鐞�")
+ @ApiModelProperty(value= "")
private String str20;
- @ApiModelProperty(value= "鎴愭湰璁＄畻鏂规硶")
+ @ApiModelProperty(value= "")
private String str21;
- @ApiModelProperty(value= "閲囪喘鍗曚綅")
+ @ApiModelProperty(value= "")
private String str22;
- @ApiModelProperty(value= "閿�鍞崟浣�")
+ @ApiModelProperty(value= "")
private String str23;
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value= "閲嶉噺")
private Double num1;
- @ApiModelProperty(value= "鏈�浣庡簱瀛樻暟閲�")
+ @ApiModelProperty(value= "")
private Double num2;
- @ApiModelProperty(value= "鏈�楂樺簱瀛樻暟閲�")
+ @ApiModelProperty(value= "")
private Double num3;
- @ApiModelProperty(value= "瀹夊叏搴撳瓨")
+ @ApiModelProperty(value= "")
private Double num4;
- @ApiModelProperty(value= "绋庣巼")
+ @ApiModelProperty(value= "")
private Double num5;
@ApiModelProperty(value= "")
diff --git a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
index 11142f4..4760530 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
@@ -23,7 +23,7 @@
private String lgnum; //瑙勬牸
private String type; // 鐗╂枡绫诲埆
- private String mnemonic; // 鍔╄鐮�
+ private String color; // 棰滆壊
private String supplier; // 渚涘簲鍟�
private String warehouse; // 浠撳簱
private String brand; // 鍝佺墝
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 2115d8f..0d8a904 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -24,7 +24,7 @@
private String lgnum; //瑙勬牸
private String type; // 鐗╂枡绫诲埆
- private String mnemonic; // 鍔╄鐮�
+ private String color; // 棰滆壊
private String supplier; // 渚涘簲鍟�
private String warehouse; // 浠撳簱
private String brand; // 鍝佺墝
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 9c917aa..9a72f82 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -61,8 +61,8 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍔╄鐮�")
- private String mnemonic;
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
/**
* 浠撳簱鍙�
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index e6b01cc..0f663b5 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -61,8 +61,8 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍔╄鐮�")
- private String mnemonic;
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
/**
* 浠撳簱鍙�
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index bd67d8e..5f8abc6 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -15,12 +15,8 @@
public static void setWrkDetl(WrkDetl wrkDetl, MatCode matCode) {
wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
- wrkDetl.setLgnum(matCode.getStr3()); // 瑙勬牸
- wrkDetl.setType(matCode.getStr2()); // 鐗╂枡绫诲埆
- wrkDetl.setMnemonic(matCode.getStr5()); // 鍔╄鐮�
- wrkDetl.setSupplier(matCode.getStr6()); // 榛樿渚涘簲鍟�
- wrkDetl.setWarehouse(matCode.getStr7()); // 榛樿浠撳簱
- wrkDetl.setBrand(matCode.getStr8()); // 鍝佺墝
+ wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
+ wrkDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
}
@@ -28,11 +24,7 @@
wrkDetl.setMatnr(locDetl.getMatnr()); // 鐗╂枡缂栧彿
wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪
wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
- wrkDetl.setType(locDetl.getType()); // 鐗╂枡绫诲埆
- wrkDetl.setMnemonic(locDetl.getMnemonic()); // 鍔╄鐮�
- wrkDetl.setSupplier(locDetl.getSupplier()); // 榛樿渚涘簲鍟�
- wrkDetl.setWarehouse(locDetl.getWarehouse()); // 榛樿浠撳簱
- wrkDetl.setBrand(locDetl.getBrand()); // 鍝佺墝
+ wrkDetl.setColor(locDetl.getColor()); // 鍔╄鐮�
wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉＄爜
}
@@ -40,12 +32,8 @@
public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
- locDetl.setLgnum(matCode.getStr3()); // 瑙勬牸
- locDetl.setType(matCode.getStr2()); // 鐗╂枡绫诲埆
- locDetl.setMnemonic(matCode.getStr5()); // 鍔╄鐮�
- locDetl.setSupplier(matCode.getStr6()); // 榛樿渚涘簲鍟�
- locDetl.setWarehouse(matCode.getStr7()); // 榛樿浠撳簱
- locDetl.setBrand(matCode.getStr8()); // 鍝佺墝
+ locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
+ locDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
}
@@ -53,11 +41,7 @@
locDetl.setMatnr(wrkDetl.getMatnr()); // 鐗╂枡缂栧彿
locDetl.setMaktx(wrkDetl.getMaktx()); // 鐗╂枡鎻忚堪
locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
- locDetl.setType(wrkDetl.getType()); // 鐗╂枡绫诲埆
- locDetl.setMnemonic(wrkDetl.getMnemonic()); // 鍔╄鐮�
- locDetl.setSupplier(wrkDetl.getSupplier()); // 榛樿渚涘簲鍟�
- locDetl.setWarehouse(wrkDetl.getWarehouse()); // 榛樿浠撳簱
- locDetl.setBrand(wrkDetl.getBrand()); // 鍝佺墝
+ locDetl.setColor(wrkDetl.getColor()); // 鍔╄鐮�
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
diff --git a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
index c78eebd..58e2130 100644
--- a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
+++ b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
@@ -18,34 +18,34 @@
@ExcelProperty(value= "鐗╂枡鍚嶇О", index = 2)
private String matName;
- @ExcelProperty(value= "鍩烘湰鍗曚綅", index = 8)
+ @ExcelProperty(value= "鐗╂枡鍗曚綅", index = 8)
private String str1;
- @ExcelProperty(value= "鐗╂枡绫诲埆", index = 3)
+ @ExcelProperty(value= "鐗╂枡瑙勬牸", index = 3)
private String str2;
- @ExcelProperty(value= "瑙勬牸鍨嬪彿", index = 5)
+ @ExcelProperty(value= "棰滆壊", index = 5)
private String str3;
- @ExcelProperty(value= "鐘舵��", index = 6)
+ @ExcelProperty(value= "瀹㈡埛", index = 6)
private String str4;
- @ExcelProperty(value= "鍔╄鐮�", index = 7)
+// @ExcelProperty(value= "鍔╄鐮�", index = 7)
private String str5;
- @ExcelProperty(value= "榛樿渚涘簲鍟�", index = 10)
+// @ExcelProperty(value= "榛樿渚涘簲鍟�", index = 10)
private String str6;
- @ExcelProperty(value= "榛樿浠撳簱", index = 13)
+// @ExcelProperty(value= "榛樿浠撳簱", index = 13)
private String str7;
- @ExcelProperty(value= "鍝佺墝", index = 9)
+// @ExcelProperty(value= "鍝佺墝", index = 9)
private String str8;
- @ExcelProperty(value= "閲囪喘鍛�", index = 11)
+// @ExcelProperty(value= "閲囪喘鍛�", index = 11)
private String str9;
- @ExcelProperty(value= "浜у湴", index = 12)
+// @ExcelProperty(value= "浜у湴", index = 12)
private String str10;
// @ExcelProperty(value= "搴忓垪鍙风鐞�")
@@ -63,31 +63,31 @@
// @ExcelProperty(value= "淇濊川鏈�")
private String str15;
- @ExcelProperty(value= "鍙攢鍞�", index = 20)
+// @ExcelProperty(value= "鍙攢鍞�", index = 20)
private String str16;
- @ExcelProperty(value= "鍙噰璐�", index = 21)
+// @ExcelProperty(value= "鍙噰璐�", index = 21)
private String str17;
- @ExcelProperty(value= "鍙负瀛愪欢", index = 22)
+// @ExcelProperty(value= "鍙负瀛愪欢", index = 22)
private String str18;
- @ExcelProperty(value= "鍙负缁勪欢", index = 23)
+// @ExcelProperty(value= "鍙负缁勪欢", index = 23)
private String str19;
// @ExcelProperty(value= "杈呭姪灞炴�х鐞�")
private String str20;
- @ExcelProperty(value= "鎴愭湰璁＄畻鏂规硶", index = 29)
+// @ExcelProperty(value= "鎴愭湰璁＄畻鏂规硶", index = 29)
private String str21;
- @ExcelProperty(value= "閲囪喘鍗曚綅", index = 30)
+// @ExcelProperty(value= "閲囪喘鍗曚綅", index = 30)
private String str22;
- @ExcelProperty(value= "閿�鍞崟浣�", index = 31)
+// @ExcelProperty(value= "閿�鍞崟浣�", index = 31)
private String str23;
-// @ExcelProperty(value= "棰勮澶╂暟")
+ @ExcelProperty(value= "閲嶉噺", index = 7)
private Double num1;
// @ExcelProperty(value= "鏈�浣庡簱瀛樻暟閲�")
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index c900d63..26dabee 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -9,7 +9,7 @@
<result column="maktx" property="maktx" />
<result column="lgnum" property="lgnum" />
<result column="type" property="type" />
- <result column="mnemonic" property="mnemonic" />
+ <result column="color" property="color" />
<result column="supplier" property="supplier" />
<result column="warehouse" property="warehouse" />
<result column="brand" property="brand" />
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index 80653ac..e828929 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -10,7 +10,7 @@
<result column="maktx" property="maktx" />
<result column="lgnum" property="lgnum" />
<result column="type" property="type" />
- <result column="mnemonic" property="mnemonic" />
+ <result column="color" property="color" />
<result column="supplier" property="supplier" />
<result column="warehouse" property="warehouse" />
<result column="brand" property="brand" />
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 15b1b6e..a4d6384 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -10,7 +10,7 @@
<result column="maktx" property="maktx" />
<result column="lgnum" property="lgnum" />
<result column="type" property="type" />
- <result column="mnemonic" property="mnemonic" />
+ <result column="color" property="color" />
<result column="supplier" property="supplier" />
<result column="warehouse" property="warehouse" />
<result column="brand" property="brand" />
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 0b6e211..642afe0 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -172,49 +172,22 @@
var matCols = [
{field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
- ,{field: 'barcode', align: 'center',title: '鏉″舰鐮�'}
,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
- ,{field: 'str1', align: 'center',title: '鍩烘湰鍗曚綅'}
- ,{field: 'str2', align: 'center',title: '鐗╂枡绫诲埆'}
- ,{field: 'str3', align: 'center',title: '瑙勬牸鍨嬪彿'}
- ,{field: 'str4', align: 'center',title: '鐘舵��', hide: true}
- ,{field: 'str5', align: 'center',title: '鍔╄鐮�'}
- ,{field: 'str6', align: 'center',title: '榛樿渚涘簲鍟�'}
- ,{field: 'str7', align: 'center',title: '榛樿浠撳簱'}
- // ,{field: 'str8', align: 'center',title: '鍝佺墝'}
- // ,{field: 'str9', align: 'center',title: '閲囪喘鍛�'}
- // ,{field: 'str10', align: 'center',title: '浜у湴'}
- // ,{field: 'str11', align: 'center',title: '搴忓垪鍙风鐞�'}
- // ,{field: 'str12', align: 'center',title: '鎵规绠＄悊'}
- // ,{field: 'str13', align: 'center',title: '淇濊川鏈熷崟浣�'}
- // ,{field: 'str14', align: 'center',title: '淇濊川鏈熺鐞�'}
- // ,{field: 'str15', align: 'center',title: '淇濊川鏈�'}
- // ,{field: 'str16', align: 'center',title: '鍙攢鍞�'}
- ,{field: 'str17', align: 'center',title: '鍙噰璐�', hide: true}
- ,{field: 'str18', align: 'center',title: '鍙负瀛愪欢', hide: true}
- // ,{field: 'str19', align: 'center',title: '鍙负缁勪欢'}
- // ,{field: 'str20', align: 'center',title: '杈呭姪灞炴�х鐞�'}
- ,{field: 'str21', align: 'center',title: '鎴愭湰璁＄畻鏂规硶', hide: true}
- ,{field: 'str22', align: 'center',title: '閲囪喘鍗曚綅', hide: true}
- ,{field: 'str23', align: 'center',title: '閿�鍞崟浣�', hide: true}
- // ,{field: 'num1', align: 'center',title: '棰勮澶╂暟'}
- // ,{field: 'num2', align: 'center',title: '鏈�浣庡簱瀛樻暟閲�'}
- // ,{field: 'num3', align: 'center',title: '鏈�楂樺簱瀛樻暟閲�'}
- // ,{field: 'num4', align: 'center',title: '瀹夊叏搴撳瓨'}
- // ,{field: 'num5', align: 'center',title: '绋庣巼'}
+ ,{field: 'str2', align: 'center',title: '鐗╂枡瑙勬牸'}
+ ,{field: 'str3', align: 'center',title: '棰滆壊'}
+ ,{field: 'num1', align: 'center',title: '閲嶉噺'}
+ ,{field: 'str1', align: 'center',title: '鐗╂枡鍗曚綅'}
+ ,{field: 'str4', align: 'center',title: '瀹㈡埛'}
]
var detlCols = [
- {field: 'matnr', align: 'center',title: '鐗╂枡缂栫爜'}
+ {field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О'}
,{field: 'lgnum', align: 'center',title: '瑙勬牸'}
- ,{field: 'type', align: 'center',title: '鐗╂枡绫诲埆'}
- // ,{field: 'mnemonic', align: 'center',title: '鍔╄鐮�'}
- // ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
- // ,{field: 'warehouse', align: 'center',title: '浠撳簱'}
- // ,{field: 'brand', align: 'center',title: '鍝佺墝'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'color', align: 'center',title: '棰滆壊'}
+ ,{field: 'anfme', align: 'center',title: '閲嶉噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'bname', align: 'center',title: '鐢ㄦ埛'}
]
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 1c13b57..2eefc15 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -240,8 +240,8 @@
removeBtn: true,
matnr: data[i].matNo,
maktx: data[i].matName,
- lgnum: data[i].str3,
- type: data[i].str2,
+ lgnum: data[i].str2,
+ color: data[i].str3,
altme: data[i].str1,
})
}
--
Gitblit v1.9.1