From d385e17d9c172c7659b252c538b45e7091c9de24 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期一, 21 二月 2022 11:07:31 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkDetlLogMapper.xml | 3
src/main/webapp/views/wrkMast/wrkDetl.html | 3
src/main/resources/mapper/LocDetlMapper.xml | 3
src/main/webapp/views/pakStore/locDetlQuery.html | 3
src/main/resources/mapper/WrkDetlMapper.xml | 3
src/main/webapp/static/js/pltBarcode/pltBarcode.js | 3
version/db/捷众数据库增加字段列表.txt | 11 +
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 9 +
src/main/java/com/zy/asrs/entity/WrkDetl.java | 34 ++++++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3
src/main/webapp/static/js/common.js | 2
src/main/webapp/static/js/pakStore/pakStore.js | 32 +++++-
src/main/webapp/static/js/wrkDetl/wrkDetl.js | 3
src/main/java/com/zy/asrs/entity/PltBarcode.java | 33 ++++++
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 35 ++++++
src/main/webapp/views/report/locDetl.html | 3
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 4
src/main/webapp/static/js/pakStore/stockAdjust.js | 4
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 3
src/main/webapp/static/js/locDetl/locDetl.js | 6 +
version/db/sxjzasrs20220211.bak | 0
src/main/java/com/zy/asrs/entity/LocDetl.java | 33 ++++++
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 6 +
src/main/resources/mapper/PltBarcodeMapper.xml | 3
src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js | 3
25 files changed, 229 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 7dea595..2f3e520 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -115,6 +115,39 @@
@TableField("qty_box")
private Double qtyBox;
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
+ private String str3;
+
+ /**
+ * 椤圭洰淇℃伅
+ */
+ @ApiModelProperty(value= "椤圭洰淇℃伅")
+ private String str4;
+ /**
+ * 绫诲埆
+ */
+ @ApiModelProperty(value= "绫诲埆")
+ private String str5;
+
+ public String getStr5$(){
+ if (Cools.isEmpty(this.str5) ){
+ return "";
+ }
+ if (this.str5.equals("1")){
+ return "鍘熸潗鏂�";
+ }
+ if (this.str5.equals("2")){
+ return "鎴愬搧";
+ }
+ if (this.str5.equals("3")){
+ return "鍗婃垚鍝�";
+ }
+ return "";
+ }
+
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
diff --git a/src/main/java/com/zy/asrs/entity/PltBarcode.java b/src/main/java/com/zy/asrs/entity/PltBarcode.java
index 57978ce..a02bdf6 100644
--- a/src/main/java/com/zy/asrs/entity/PltBarcode.java
+++ b/src/main/java/com/zy/asrs/entity/PltBarcode.java
@@ -204,6 +204,39 @@
@TableField("qty_box")
private Double qtyBox;
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
+ private String str3;
+
+ /**
+ * 椤圭洰淇℃伅
+ */
+ @ApiModelProperty(value= "椤圭洰淇℃伅")
+ private String str4;
+ /**
+ * 绫诲埆
+ */
+ @ApiModelProperty(value= "绫诲埆")
+ private String str5;
+
+ public String getStr5$(){
+ if (Cools.isEmpty(this.str5) ){
+ return "";
+ }
+ if (this.str5.equals("1")){
+ return "鍘熸潗鏂�";
+ }
+ if (this.str5.equals("2")){
+ return "鎴愬搧";
+ }
+ if (this.str5.equals("3")){
+ return "鍗婃垚鍝�";
+ }
+ return "";
+ }
+
public PltBarcode() {}
public PltBarcode(String barcode,Double allQty,Double qtyBox,String source,String supplier,String vendor,Double allWeight,String billNo,Integer seqNo,Integer billType,String matNo,String matName,Double qty,String locNo,String specs,String unit,String size,String color,Double weight,String memo,Integer linkErp,Integer ioStatus,Date ioTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 161f657..cbe66df 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -166,6 +166,40 @@
@ApiModelProperty(value= "姣忕鏁伴噺")
@TableField("qty_box")
private Double qtyBox;
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
+ private String str3;
+
+ /**
+ * 椤圭洰淇℃伅
+ */
+ @ApiModelProperty(value= "椤圭洰淇℃伅")
+ private String str4;
+ /**
+ * 绫诲埆
+ */
+ @ApiModelProperty(value= "绫诲埆")
+ private String str5;
+
+ public String getStr5$(){
+ if (Cools.isEmpty(this.str5) ){
+ return "";
+ }
+ if (this.str5.equals("1")){
+ return "鍘熸潗鏂�";
+ }
+ if (this.str5.equals("2")){
+ return "鎴愬搧";
+ }
+ if (this.str5.equals("3")){
+ return "鍗婃垚鍝�";
+ }
+ return "";
+ }
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index d8d60d5..351bdc1 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -159,7 +159,40 @@
@ApiModelProperty(value = "姣忕鏁伴噺")
@TableField("qty_box")
private Double qtyBox;
-
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
+ private String str3;
+
+ /**
+ * 椤圭洰淇℃伅
+ */
+ @ApiModelProperty(value= "椤圭洰淇℃伅")
+ private String str4;
+ /**
+ * 绫诲埆
+ */
+ @ApiModelProperty(value= "绫诲埆")
+ private String str5;
+
+ public String getStr5$(){
+ if (Cools.isEmpty(this.str5) ){
+ return "";
+ }
+ if (this.str5.equals("1")){
+ return "鍘熸潗鏂�";
+ }
+ if (this.str5.equals("2")){
+ return "鎴愬搧";
+ }
+ if (this.str5.equals("3")){
+ return "鍗婃垚鍝�";
+ }
+ return "";
+ }
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index cb0209b..9804444 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -106,6 +106,9 @@
pltBarcode.setVendor(combMat.getVendor());
pltBarcode.setSource(combMat.getSource());
pltBarcode.setQtyBox(matCode.getStr6());
+ pltBarcode.setStr3(matCode.getStr3());
+ pltBarcode.setStr4(matCode.getStr4());
+ pltBarcode.setStr5(matCode.getStr5());
if (!pltBarcodeService.insert(pltBarcode)) {
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
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 05cdbe8..b6b8d33 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -285,6 +285,9 @@
wrkDetl.setVendor(detlDto.getLocDetl().getVendor());
wrkDetl.setSource(detlDto.getLocDetl().getSource());
wrkDetl.setSupplier(detlDto.getLocDetl().getSupplier());
+ wrkDetl.setStr5(matCode.getStr5());
+ wrkDetl.setStr4(matCode.getStr4());
+ wrkDetl.setStr3(matCode.getStr3());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
@@ -693,6 +696,9 @@
locDetl.setQtyBox(matCode.getStr6());
locDetl.setAllQty(matCode.getStr6()*adjust.getCount());
locDetl.setAllWeight(matCode.getWeight()*adjust.getCount()+30);
+ locDetl.setStr3(matCode.getStr3());
+ locDetl.setStr4(matCode.getStr4());
+ locDetl.setStr5(matCode.getStr5());
if (!locDetlService.insert(locDetl)) {
throw new CoolException("淇濆瓨搴撳瓨鏄庣粏澶辫触");
}
@@ -725,6 +731,9 @@
sqlParam1.setQtyBox(matCode.getStr6());
sqlParam1.setAllQty(matCode.getStr6()*adjust.getCount());
sqlParam1.setAllWeight(matCode.getWeight()*adjust.getCount()+30);
+ sqlParam1.setStr5(matCode.getStr5());
+ sqlParam1.setStr4(matCode.getStr4());
+ sqlParam1.setStr3(matCode.getStr3());
if (!locDetlService.update(sqlParam1, new EntityWrapper<LocDetl>()
.eq("loc_no", locMast.getLocNo())
.eq("mat_no", adjust.getMatNo())
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 8e15c5b..d148d52 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -70,6 +70,9 @@
wrkDetl.setVendor(dto.getVendor());
wrkDetl.setWeight(matCode.getWeight());
wrkDetl.setQtyBox(matCode.getStr6());
+ wrkDetl.setStr3(matCode.getStr3());
+ wrkDetl.setStr4(matCode.getStr4());
+ wrkDetl.setStr5(matCode.getStr5());
if (!this.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
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 d6605e3..de208c9 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -124,7 +124,9 @@
locDetl.setVendor(wrk_no.getVendor());
locDetl.setWeight(matCode.getWeight());
locDetl.setQtyBox(matCode.getStr6());
-
+ locDetl.setStr3(matCode.getStr3());
+ locDetl.setStr4(matCode.getStr4());
+ locDetl.setStr5(matCode.getStr5());
if (!Cools.isEmpty(wrk_no)){
locDetl.setMemo(wrk_no.getMemo());
locDetl.setSupplier(wrk_no.getSupplier());
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index a23c595..b0d6b6d 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -28,6 +28,9 @@
<result column="source" property="source" />
<result column="vendor" property="vendor" />
<result column="qty_box" property="qtyBox"/>
+ <result column="str3" property="str3" />
+ <result column="str4" property="str4" />
+ <result column="str5" property="str5"/>
</resultMap>
<sql id="stockOutCondition">
diff --git a/src/main/resources/mapper/PltBarcodeMapper.xml b/src/main/resources/mapper/PltBarcodeMapper.xml
index ce8b2a6..722744d 100644
--- a/src/main/resources/mapper/PltBarcodeMapper.xml
+++ b/src/main/resources/mapper/PltBarcodeMapper.xml
@@ -31,6 +31,9 @@
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
<result column="qty_box" property="qtyBox"/>
+ <result column="str3" property="str3" />
+ <result column="str4" property="str4" />
+ <result column="str5" property="str5"/>
</resultMap>
</mapper>
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index 11ad26e..fc0a0de 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -30,6 +30,9 @@
<result column="source" property="source" />
<result column="vendor" property="vendor" />
<result column="qty_box" property="qtyBox"/>
+ <result column="str3" property="str3" />
+ <result column="str4" property="str4" />
+ <result column="str5" property="str5"/>
</resultMap>
</mapper>
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index b7f75cd..ddb8043 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -30,6 +30,9 @@
<result column="source" property="source" />
<result column="vendor" property="vendor" />
<result column="qty_box" property="qtyBox"/>
+ <result column="str3" property="str3" />
+ <result column="str4" property="str4" />
+ <result column="str5" property="str5"/>
</resultMap>
<select id="queryWrkDetl" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index e172ae1..a32832d 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -197,6 +197,6 @@
,{field: 'str3', align: 'center', title: '瀹㈡埛鍚嶇О'}
,{field: 'str4', align: 'center', title: '椤圭洰淇℃伅'}
,{field: 'str5$', align: 'center', title: '绫诲埆'}
- ,{field: 'str6', align: 'center', title: '姣忕鏁伴噺(PCS)'}
+ ,{field: 'qtyBox', align: 'center', title: '姣忕鏁伴噺(PCS)'}
]
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index f0deea4..a2c8519 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -16,7 +16,11 @@
,{field: 'color', align: 'center',title: '棰滆壊'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
// ,{field: 'bname', align: 'center',title: '搴撲綅鍚嶇О'}
- ,{field: 'memo', align: 'center',title: '鐢熶骇鏃ユ湡'}];
+ ,{field: 'memo', align: 'center',title: '鐢熶骇鏃ユ湡'}
+ ,{field: 'str3', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'str4', align: 'center',title: '椤圭洰淇℃伅'}
+ ,{field: 'str5$', align: 'center',title: '绫诲埆'}
+ ];
// cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 9b0b98e..5afb458 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -43,19 +43,26 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
+ // var index = ;
+ // console.log(obj.tr.parents('tr'))
+ // console.log($('obj').othis)
+ // console.log(obj.parents('tr').attr("data-index"));
switch (obj.field) {
case 'count':
updateMatCodeData(obj.data.matNo, obj.data.supplier, Number(obj.value));
break
case 'supplier':
// updateMatCodeSupplier(obj.data.matNo, obj.value);
- // debugger
for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matNo"] === obj.data.matNo
- && (matCodeData[i]["supplier"] === obj.data.supplier || matCodeData[i]["supplier"]==='')){
+ if (matCodeData[i]["matNo"] === obj.data.matNo){
matCodeData[i]["supplier"] = obj.data.supplier;
}
}
+ // tableIns.reload({data: matCodeData,done:function (res) {
+ // limit();
+ // // getInBound();
+ // // 瑕嗙洊render鏂规硶鐨刣one
+ // }});
break
case 'source':
for (var i=0;i<matCodeData.length;i++){
@@ -73,7 +80,21 @@
}
}
break;
+
+ // case 'memo':
+ // for (var i=0;i<matCodeData.length;i++){
+ // if (matCodeData[i]["matNo"] === obj.data.matNo
+ // && (matCodeData[i]["supplier"] === obj.data.supplier || matCodeData[i]["supplier"]==='')){
+ // matCodeData[i]["memo"] = obj.data.memo;
+ // }
+ // }
+ // break;
}
+ tableIns.reload({data: matCodeData,done:function (res) {
+ limit();
+ getInBound();
+ // 瑕嗙洊render鏂规硶鐨刣one
+ }});
});
@@ -128,12 +149,11 @@
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(chooseData)', function(obj){
- var data = obj.data;
switch (obj.event) {
case 'remove':
for (var i = matCodeData.length - 1; i >= 0; i--) {
- if (matCodeData[i].matNo === data.matNo) {
+ if (matCodeData[i].matNo === obj.data.matNo) {
matCodeData.splice(i, 1);
}
}
@@ -156,7 +176,7 @@
yes: function(index, layero){
var memo = layer.getChildFrame('body', index).find("#memo")[0].value;
matCodeData.map(function (item) {
- if (item.matNo === data.matNo && item.supplier === data.supplier) {
+ if (item.matNo === obj.data.matNo && item.supplier === obj.data.supplier) {
item.memo = memo;
}
});
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index d234aee..e81a6e6 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -12,7 +12,9 @@
{field: 'supplier', title: '鎵瑰彿', align: 'center', width: 120},
{field: 'source', title: '鏉ユ簮', align: 'center', edit:'text', width: 120},
{field: 'vendor', title: '渚涘簲鍟�', align: 'center', edit:'text', width: 120}
- ,{field: 'qtyBox', align: 'center', title: '姣忕鏁伴噺(PCS)'}
+ ,{field: 'str3', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'str4', align: 'center',title: '椤圭洰淇℃伅'}
+ ,{field: 'str5$', align: 'center',title: '绫诲埆'}
// {field: 'allqty', title: '鎬绘暟閲�', align: 'center'},
// {field: 'allweight', title: '鎬婚噸閲�', align: 'center'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
diff --git a/src/main/webapp/static/js/pltBarcode/pltBarcode.js b/src/main/webapp/static/js/pltBarcode/pltBarcode.js
index a139d5e..02d3121 100644
--- a/src/main/webapp/static/js/pltBarcode/pltBarcode.js
+++ b/src/main/webapp/static/js/pltBarcode/pltBarcode.js
@@ -41,6 +41,9 @@
,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
,{field: 'vendor', align: 'center',title: '渚涘簲鍟�'}
,{field: 'memo', align: 'center',title: '鐢熶骇鏃ユ湡'}
+ ,{field: 'str3', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'str4', align: 'center',title: '椤圭洰淇℃伅'}
+ ,{field: 'str5$', align: 'center',title: '绫诲埆'}
,{field: 'linkErp$', align: 'center',title: 'ERP杩炵嚎', hide: true}
,{field: 'ioStatus$', align: 'center',title: '瀹屾垚鐘舵��'}
,{field: 'ioTime$', align: 'center',title: '瀹屾垚鏃堕棿', hide: true}
diff --git a/src/main/webapp/static/js/wrkDetl/wrkDetl.js b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
index 28569f7..6444d02 100644
--- a/src/main/webapp/static/js/wrkDetl/wrkDetl.js
+++ b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
@@ -12,6 +12,9 @@
,{field: 'source', align: 'center',title: '鏉ユ簮'}
,{field: 'vendor', align: 'center',title: '渚涘簲鍟�'}
,{field: 'billNo', align: 'center',title: '鍗曟嵁缂栧彿', hide:true}
+ ,{field: 'str3', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'str4', align: 'center',title: '椤圭洰淇℃伅'}
+ ,{field: 'str5$', align: 'center',title: '绫诲埆'}
,{field: 'seqNo', align: 'center',title: '搴忓彿', width:80, hide:true}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
diff --git a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
index c1cd2e4..ff4b7bc 100644
--- a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
+++ b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
@@ -9,6 +9,9 @@
,{field: 'allWeight', align: 'center',title: '鎬婚噸閲�(KG)'}
,{field: 'source', align: 'center',title: '鏉ユ簮'}
,{field: 'vendor', align: 'center',title: '渚涘簲鍟�'}
+ ,{field: 'str3', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'str4', align: 'center',title: '椤圭洰淇℃伅'}
+ ,{field: 'str5$', align: 'center',title: '绫诲埆'}
];
cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index e54f92e..f98139a 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -99,7 +99,11 @@
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
];
cols.push.apply(cols, detlCols);
- cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+ cols.push(
+ {field: 'str3', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'str4', align: 'center',title: '椤圭洰淇℃伅'}
+ ,{field: 'str5$', align: 'center',title: '绫诲埆'}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
return cols;
}
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index e66e55a..9c5d9f1 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -113,6 +113,9 @@
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
// ,{field: 'bname', align: 'center',title: '搴撲綅鍚嶇О'}
,{field: 'memo', align: 'center',title: '鐢熶骇鏃ユ湡'}
+ ,{field: 'str3', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'str4', align: 'center',title: '椤圭洰淇℃伅'}
+ ,{field: 'str5$', align: 'center',title: '绫诲埆'}
];
// cols.push.apply(cols, detlCols);
diff --git a/src/main/webapp/views/report/locDetl.html b/src/main/webapp/views/report/locDetl.html
index e26666c..e2cf157 100644
--- a/src/main/webapp/views/report/locDetl.html
+++ b/src/main/webapp/views/report/locDetl.html
@@ -50,6 +50,9 @@
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
// ,{field: 'bname', align: 'center',title: '搴撲綅鍚嶇О'}
,{field: 'memo', align: 'center',title: '鐢熶骇鏃ユ湡'}
+ ,{field: 'str3', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'str4', align: 'center',title: '椤圭洰淇℃伅'}
+ ,{field: 'str5$', align: 'center',title: '绫诲埆'}
];
// cols.push.apply(cols, detlCols);
return cols;
diff --git a/src/main/webapp/views/wrkMast/wrkDetl.html b/src/main/webapp/views/wrkMast/wrkDetl.html
index 48a4433..0183851 100644
--- a/src/main/webapp/views/wrkMast/wrkDetl.html
+++ b/src/main/webapp/views/wrkMast/wrkDetl.html
@@ -48,6 +48,9 @@
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
// ,{field: 'bname', align: 'center',title: '搴撲綅鍚嶇О'}
,{field: 'memo', align: 'center',title: '鐢熶骇鏃ユ湡'}
+ ,{field: 'str3', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'str4', align: 'center',title: '椤圭洰淇℃伅'}
+ ,{field: 'str5$', align: 'center',title: '绫诲埆'}
];
// cols.push.apply(cols, detlCols);
diff --git a/version/db/sxjzasrs20220211.bak b/version/db/sxjzasrs20220211.bak
index de0b8b5..5d7f73b 100644
--- a/version/db/sxjzasrs20220211.bak
+++ b/version/db/sxjzasrs20220211.bak
Binary files differ
diff --git "a/version/db/\346\215\267\344\274\227\346\225\260\346\215\256\345\272\223\345\242\236\345\212\240\345\255\227\346\256\265\345\210\227\350\241\250.txt" "b/version/db/\346\215\267\344\274\227\346\225\260\346\215\256\345\272\223\345\242\236\345\212\240\345\255\227\346\256\265\345\210\227\350\241\250.txt"
index ba1d76e..684ca2e 100644
--- "a/version/db/\346\215\267\344\274\227\346\225\260\346\215\256\345\272\223\345\242\236\345\212\240\345\255\227\346\256\265\345\210\227\350\241\250.txt"
+++ "b/version/db/\346\215\267\344\274\227\346\225\260\346\215\256\345\272\223\345\242\236\345\212\240\345\255\227\346\256\265\345\210\227\350\241\250.txt"
@@ -1,13 +1,16 @@
-缁勬墭琛紙plt_barcode鍜宲lt_barcode_log)鏈夛細all_qty(鎬绘暟閲忥紝娴偣绫诲瀷) all_weight(鎬婚噸閲忥紝娴偣绫诲瀷)
+缁勬墭琛紙plt_barcode鍜宲lt_barcode_log)鏂板鏈夛細all_qty(鎬绘暟閲忥紝娴偣绫诲瀷) all_weight(鎬婚噸閲忥紝娴偣绫诲瀷)
source(鏉ユ簮锛屽瓧绗︿覆) supplier(鎵瑰彿锛屽瓧绗︿覆) vendor(渚涘簲鍟嗭紝瀛楃涓�) qty_box(姣忕鏁伴噺锛屾诞鐐圭被鍨�)
+str3锛堝鎴峰悕绉帮紝瀛楃涓诧級 str4锛堥」鐩俊鎭紝瀛楃涓诧級 str5锛堢被鍒紝瀛楃涓诧級
-宸ヤ綔妗ｏ紙wrk_detl鍜寃rk_detl_log锛夋湁锛歛ll_qty(鎬绘暟閲忥紝娴偣绫诲瀷) all_weight(鎬婚噸閲忥紝娴偣绫诲瀷)
-source(鏉ユ簮锛屽瓧绗︿覆) vendor(渚涘簲鍟嗭紝瀛楃涓�) qty_box(姣忕鏁伴噺锛屾诞鐐圭被鍨�)
+宸ヤ綔妗ｏ紙wrk_detl鍜寃rk_detl_log锛夋柊澧炴湁锛歛ll_qty(鎬绘暟閲忥紝娴偣绫诲瀷) all_weight(鎬婚噸閲忥紝娴偣绫诲瀷)
+source(鏉ユ簮锛屽瓧绗︿覆) vendor(渚涘簲鍟嗭紝瀛楃涓�) qty_box(姣忕鏁伴噺锛屾诞鐐圭被鍨�) supplier鏀逛负涓婚敭锛坵rk_detl_log涓嶆敼锛�
+str3锛堝鎴峰悕绉帮紝瀛楃涓诧級 str4锛堥」鐩俊鎭紝瀛楃涓诧級 str5锛堢被鍒紝瀛楃涓诧級
-搴撳瓨琛紙loc_detl锛夋湁锛歛ll_qty(鎬绘暟閲忥紝娴偣绫诲瀷) all_weight(鎬婚噸閲忥紝娴偣绫诲瀷)
+搴撳瓨琛紙loc_detl锛夋柊澧炴湁锛歛ll_qty(鎬绘暟閲忥紝娴偣绫诲瀷) all_weight(鎬婚噸閲忥紝娴偣绫诲瀷)
source(鏉ユ簮锛屽瓧绗︿覆) vendor(渚涘簲鍟嗭紝瀛楃涓�) qty_box(姣忕鏁伴噺锛屾诞鐐圭被鍨�) supplier鏀逛负涓婚敭
+str3锛堝鎴峰悕绉帮紝瀛楃涓诧級 str4锛堥」鐩俊鎭紝瀛楃涓诧級 str5锛堢被鍒紝瀛楃涓诧級
鐗╂枡琛紙mat_code锛夊彉鏇存湁锛歴tr3锛堝鎴峰悕绉帮紝瀛楃涓诧級 str4锛堥」鐩俊鎭紝瀛楃涓诧級 str5锛堢被鍒紝瀛楃涓诧級
--
Gitblit v1.9.1