From 9b31428152f0fc993130a9adf58f6163db9ea667 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期一, 14 二月 2022 21:23:52 +0800
Subject: [PATCH] 字段全部添加
---
src/main/java/com/zy/asrs/entity/PltBarcode.java | 45 ++++------
src/main/java/com/zy/asrs/entity/param/CombParam.java | 15 ++-
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 15 +++
src/main/webapp/views/wrkMast/wrkDetl.html | 4 +
src/main/webapp/views/report/locDetl.html | 4 +
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 4 +
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 14 +++
src/main/java/com/zy/asrs/entity/MatCodeCountDto.java | 14 +++
src/main/webapp/views/pda/matQuery.html | 25 ++----
src/main/webapp/static/js/locDetl/locDetl.js | 4 +
src/main/webapp/static/js/pltBarcode/pltBarcode.js | 9 +-
version/db/sxjzasrs20220211.bak | 0
src/main/resources/mapper/PltBarcodeMapper.xml | 3
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 36 ++++++++
src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js | 4 +
src/main/webapp/static/js/pakStore/pakStore.js | 7 +
16 files changed, 144 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
index 40b0dae..d080d53 100644
--- a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
+++ b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
@@ -16,6 +16,20 @@
private String supplier;
private String memo;
+ //渚涘簲鍟�
+ private String vendor;
+ //鏉ユ簮
+ private String source;
+
+ public String getVendor(){return vendor;}
+
+ public void setVendor(String vendor){this.vendor=vendor;}
+
+ public String getSource() { return source; }
+
+ public void setSource(String source) {
+ this.source = source;
+ }
public String getMemo() {
return memo;
diff --git a/src/main/java/com/zy/asrs/entity/PltBarcode.java b/src/main/java/com/zy/asrs/entity/PltBarcode.java
index 90b47bd..57978ce 100644
--- a/src/main/java/com/zy/asrs/entity/PltBarcode.java
+++ b/src/main/java/com/zy/asrs/entity/PltBarcode.java
@@ -120,14 +120,14 @@
*/
@ApiModelProperty(value= "鎬婚噸閲�")
@TableField("all_weight")
- private double allWeight;
+ private Double allWeight;
/**
- * 鏉ユ簮锛�1銆佸鍗� 2銆佽嚜鍒� 3銆佸渚�
+ * 鏉ユ簮
*/
- @ApiModelProperty(value="鏉ユ簮锛�1銆佸鍗� 2銆佽嚜鍒� 3銆佸渚�")
- private Integer source;
+ @ApiModelProperty(value="鏉ユ簮")
+ private String source;
/**
- * 渚涘簲鍟�
+ * 鎵瑰彿
*/
@ApiModelProperty(value = "鎵瑰彿")
private String supplier;
@@ -135,8 +135,7 @@
* 渚涘簲鍟�
*/
@ApiModelProperty(value = "渚涘簲鍟�")
- @TableField("batch_number")
- private String batchNumber;
+ private String vendor;
/**
* 澶囨敞
*/
@@ -198,9 +197,16 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date appeTime;
+ /**
+ * 鍗曠鏁伴噺
+ */
+ @ApiModelProperty(value = "鍗曠鏁伴噺")
+ @TableField("qty_box")
+ private Double qtyBox;
+
public PltBarcode() {}
- public PltBarcode(String barcode,double allQty,Integer source,String supplier,String batchNumber,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) {
+ 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) {
this.barcode = barcode;
this.billNo = billNo;
this.seqNo = seqNo;
@@ -226,7 +232,8 @@
this.allWeight=allWeight;
this.source=source;
this.supplier=supplier;
- this.batchNumber=batchNumber;
+ this.vendor=vendor;
+ this.qtyBox=qtyBox;
}
// PltBarcode pltBarcode = new PltBarcode(
@@ -263,11 +270,11 @@
public double getAllWeight(){return allWeight;}
- public void setAllWeight(double allweight){this.allWeight=allweight;}
+ public void setAllWeight(Double allweight){this.allWeight=allweight;}
- public double getAllQty(){return allQty;}
+ public Double getAllQty(){return allQty;}
- public void setAllQty(double allqty){this.allQty=allqty;}
+ public void setAllQty(Double allqty){this.allQty=allqty;}
public String getBillNo() {
return billNo;
@@ -287,20 +294,6 @@
public Integer getBillType() {
return billType;
- }
-
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
- case 1:
- return "澶栧崗";
- case 2:
- return "鑷埗";
- case 3:
- return "瀹緵";
- default:
- return String.valueOf(this.source);
- }
}
public String getBillType$(){
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index f2df93f..4856f1b 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -25,12 +25,17 @@
private Double count;
//鎵瑰彿
private String supplier;
-
+ //渚涘簲鍟�
+ private String vendor;
//鏉ユ簮
- private Integer source;
+ private String source;
private String memo;
+
+ public String getVendor(){return vendor;}
+
+ public void setVendor(String vendor){this.vendor=vendor;}
public String getSeqNo() {
return seqNo;
}
@@ -39,11 +44,9 @@
this.seqNo = seqNo;
}
- public Integer getSource() {
- return source;
- }
+ public String getSource() { return source; }
- public void setSource(Integer source) {
+ public void setSource(String source) {
this.source = source;
}
diff --git a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
index 2b044e4..5f11c51 100644
--- a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -35,6 +35,21 @@
private String memo;
+ //渚涘簲鍟�
+ private String vendor;
+ //鏉ユ簮
+ private String source;
+
+ public String getVendor(){return vendor;}
+
+ public void setVendor(String vendor){this.vendor=vendor;}
+
+ public String getSource() { return source; }
+
+ public void setSource(String source) {
+ this.source = source;
+ }
+
public String getMemo() {
return memo;
}
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 3977f57..98cf0ee 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -17,6 +17,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
+import java.time.chrono.IsoEra;
import java.util.Date;
import java.util.List;
import java.util.Random;
@@ -78,7 +79,12 @@
pltBarcode.setUnit(matCode.getUnit());
pltBarcode.setSpecs(matCode.getSpecs());
pltBarcode.setSize(matCode.getSize());
-// pltBarcode.setSupplier(combMat.getSupplier());
+ if(Cools.isEmpty(combMat.getSupplier())){
+ String supp = sdf.format(new Date()) + r;
+ pltBarcode.setSupplier(supp);
+ }else{
+ pltBarcode.setSupplier(combMat.getSupplier());
+ }
pltBarcode.setMemo(combMat.getMemo());
pltBarcode.setColor(matCode.getColor());
pltBarcode.setLinkErp(0);
@@ -97,16 +103,24 @@
}
pltBarcode.setWeight(matCode.getWeight());
pltBarcode.setAllWeight(matCode.getWeight()*pltBarcode.getQty()+30);
+ pltBarcode.setVendor(combMat.getVendor());
+ pltBarcode.setSource(combMat.getSource());
+ pltBarcode.setQtyBox(matCode.getStr6());
if (!pltBarcodeService.insert(pltBarcode)) {
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
}
} else {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+ Random rand = new Random();
+ Integer r = rand.nextInt(900)+ 100;
// 鍏宠仈閫氱煡鍗曠粍鎵�
for (CombParam.CombMat combMat : param.getCombMats()) {
WaitMatin waitMatin = waitMatinService.selectOne(new EntityWrapper<WaitMatin>()
.eq("bill_no",param.getBillNo()).eq("seq_no",combMat.getSeqNo()));
+
+ MatCode matCode = matCodeService.selectOne(new EntityWrapper<MatCode>().eq("mat_no", combMat.getMatNo()));
if (waitMatin == null) {
throw new CoolException("閫氱煡鍗曚笉瀛樺湪" + combMat.getMatNo() + "鏁版嵁锛�");
@@ -133,7 +147,25 @@
pltBarcode.setModiTime(now);
pltBarcode.setAppeUser(userId);
pltBarcode.setAppeTime(now);
-
+ if(Cools.isEmpty(combMat.getSupplier())){
+ String supp = sdf.format(new Date()) + r;
+ pltBarcode.setSupplier(supp);
+ }else{
+ pltBarcode.setSupplier(combMat.getSupplier());
+ }
+ if(matCode.getWeight()==null){
+ matCode.setWeight(0.0);
+ }
+ if(matCode.getStr6()==null){
+ matCode.setStr6(0.0);
+ pltBarcode.setAllQty(pltBarcode.getQty());
+ }else {
+ pltBarcode.setAllQty(matCode.getStr6()*pltBarcode.getQty());
+ }
+ pltBarcode.setWeight(matCode.getWeight());
+ pltBarcode.setAllWeight(matCode.getWeight()*pltBarcode.getQty()+30);
+ pltBarcode.setVendor(combMat.getVendor());
+ pltBarcode.setSource(combMat.getSource());
if (!pltBarcodeService.insert(pltBarcode)) {
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
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 02676c6..84e51bb 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -49,13 +49,25 @@
}else {
wrkDetl.setSupplier(dto.getSupplier());
}
-
wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
wrkDetl.setAppeUser(userId);
wrkDetl.setAppeTime(new Date());
wrkDetl.setMemo(dto.getMemo());
wrkDetl.setModiUser(userId);
wrkDetl.setModiTime(new Date());
+ //鏂板鍔犲瓧娈�
+ if(matCode.getWeight()==null){
+ matCode.setWeight(0.0);
+ }
+ if(matCode.getStr6()==null){
+ matCode.setStr6(0.0);
+ wrkDetl.setAllQty(dto.getCount());
+ }else {
+ wrkDetl.setAllQty(matCode.getStr6()*dto.getCount());
+ }
+ wrkDetl.setAllWeight(matCode.getWeight()*dto.getCount()+30);
+ wrkDetl.setSource(dto.getSource());
+ wrkDetl.setVendor(dto.getVendor());
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 2e0151d..615bd67 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -114,6 +114,10 @@
VersionUtils.setLocDetl(locDetl, wrkDetl); // 鐗堟湰鎺у埗
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+ locDetl.setAllQty(wrk_no.getAllQty());
+ locDetl.setAllWeight(wrk_no.getAllWeight());
+ locDetl.setSource(wrk_no.getSource());
+ locDetl.setVendor(wrk_no.getVendor());
if (!Cools.isEmpty(wrk_no)){
locDetl.setMemo(wrk_no.getMemo());
locDetl.setSupplier(wrk_no.getSupplier());
diff --git a/src/main/resources/mapper/PltBarcodeMapper.xml b/src/main/resources/mapper/PltBarcodeMapper.xml
index 7e9b785..ce8b2a6 100644
--- a/src/main/resources/mapper/PltBarcodeMapper.xml
+++ b/src/main/resources/mapper/PltBarcodeMapper.xml
@@ -16,6 +16,7 @@
<result column="specs" property="specs" />
<result column="source" property="source"/>
<result column="supplier" property="supplier"/>
+ <result column="vendor" property="vendor"/>
<result column="unit" property="unit" />
<result column="size" property="size" />
<result column="color" property="color" />
@@ -29,7 +30,7 @@
<result column="modi_time" property="modiTime" />
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
-
+ <result column="qty_box" property="qtyBox"/>
</resultMap>
</mapper>
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 3697a85..4631d76 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -5,6 +5,10 @@
,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'allQty', align: 'center',title: '鎬绘暟閲�'}
+ ,{field: 'allWeight', align: 'center',title: '鎬婚噸閲�'}
+ ,{field: 'source', align: 'center',title: '鏉ユ簮'}
+ ,{field: 'vendor', align: 'center',title: '渚涘簲鍟�'}
,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
,{field: 'color', align: 'center',title: '棰滆壊'}
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 459fb05..822ccd4 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -4,7 +4,11 @@
function getCol() {
var cols = [
{fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭～)', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
- {field: 'supplier', title: '鎵瑰彿', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
+ {field: 'supplier', title: '鎵瑰彿', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
+ {field: 'source', title: '鏉ユ簮', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
+ {field: 'vendor', title: '渚涘簲鍟�', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
+ {field: 'allqty', title: '鎬绘暟閲�', align: 'center'},
+ {field: 'allweight', title: '鎬婚噸閲�', align: 'center'}
];
cols.push.apply(cols, matCols);
cols.push(
@@ -80,7 +84,6 @@
}
}
console.log(matCodeData);
- debugger
$.ajax({
url: baseUrl+"/full/store/put/start",
headers: {'token': localStorage.getItem('token')},
diff --git a/src/main/webapp/static/js/pltBarcode/pltBarcode.js b/src/main/webapp/static/js/pltBarcode/pltBarcode.js
index 3d25d07..b5d1951 100644
--- a/src/main/webapp/static/js/pltBarcode/pltBarcode.js
+++ b/src/main/webapp/static/js/pltBarcode/pltBarcode.js
@@ -27,18 +27,19 @@
,{field: 'billType$', align: 'center',title: '鍗曟嵁绫诲瀷', hide: true}
,{field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
- ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'qty', align: 'center',title: '鍏ュ簱鏁伴噺'}
+ ,{field: 'qtyBox', align: 'center',title: '姣忕鏁伴噺'}
,{field: 'allQty', align: 'center',title: '鎬绘暟閲�'}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'size', align: 'center',title: '灏哄', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曢噸' }
- ,{field: 'allWeight', align: 'center',title: '鎬婚噸'}
+ ,{field: 'weight', align: 'center',title: '姣忕閲嶉噺(KG)' }
+ ,{field: 'allWeight', align: 'center',title: '鎬婚噸閲�(KG)'}
,{field: 'source', align: 'center',title: '鏉ユ簮'}
,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
- ,{field: 'batchNumber', align: 'center',title: '渚涘簲鍟�'}
+ ,{field: 'vendor', align: 'center',title: '渚涘簲鍟�'}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
,{field: 'linkErp$', align: 'center',title: 'ERP杩炵嚎', hide: true}
,{field: 'ioStatus$', align: 'center',title: '瀹屾垚鐘舵��'}
diff --git a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
index c4a776a..39a75d4 100644
--- a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
+++ b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
@@ -3,6 +3,10 @@
var cols = [
{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
+ ,{field: 'allQty', align: 'center',title: '鎬绘暟閲�'}
+ ,{field: 'allWeight', align: 'center',title: '鎬婚噸閲�'}
+ ,{field: 'source', align: 'center',title: '鏉ユ簮'}
+ ,{field: 'vendor', align: 'center',title: '渚涘簲鍟�'}
];
cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 37efd52..d185eef 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -96,25 +96,14 @@
<span>鐢熶骇鏃ユ湡</span>
<input id="memo" type="text">
</div>
-<!-- <div class="form-item">-->
-<!-- <span>鏉ユ簮</span>-->
-<!-- <input id="source" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">-->
-<!-- </div>-->
- <div class="layui-inline">
- <label class="layui-form-label">鏉ユ簮</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="source" name="source" class="layui-input" type="text" style="display: none">
- <input id="Source$" name="Source$" 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="matTypeBymatType" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="matTypeBymatTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
+ <div class="form-item">
+ <span>鏉ユ簮</span>
+ <input id="source" type="text">
</div>
+
<div class="form-item">
<span>渚涘簲鍟�</span>
- <input id="supplier1" type="text">
+ <input id="vendor" type="text">
</div>
<div class="form-item">
<span>鍗曚綅</span>
@@ -176,7 +165,9 @@
matName: $('#matName').val(),
count: countDom.val(),
supplier: $('#supplier').val(),
- memo: $('#memo').val()
+ memo: $('#memo').val(),
+ vendor:$('#vendor').val(),
+ source:$('#source').val(),
};
if(countDom.val()<=0){
diff --git a/src/main/webapp/views/report/locDetl.html b/src/main/webapp/views/report/locDetl.html
index 477e401..cf2a497 100644
--- a/src/main/webapp/views/report/locDetl.html
+++ b/src/main/webapp/views/report/locDetl.html
@@ -38,6 +38,10 @@
,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'allQty', align: 'center',title: '鎬绘暟閲�'}
+ ,{field: 'allWeight', align: 'center',title: '鎬婚噸閲�'}
+ ,{field: 'source', align: 'center',title: '鏉ユ簮'}
+ ,{field: 'vendor', align: 'center',title: '渚涘簲鍟�'}
,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
,{field: 'color', align: 'center',title: '棰滆壊'}
diff --git a/src/main/webapp/views/wrkMast/wrkDetl.html b/src/main/webapp/views/wrkMast/wrkDetl.html
index 07195be..e8dff51 100644
--- a/src/main/webapp/views/wrkMast/wrkDetl.html
+++ b/src/main/webapp/views/wrkMast/wrkDetl.html
@@ -36,6 +36,10 @@
,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'allQty', align: 'center',title: '鎬绘暟閲�'}
+ ,{field: 'allWeight', align: 'center',title: '鎬婚噸閲�'}
+ ,{field: 'source', align: 'center',title: '鏉ユ簮'}
+ ,{field: 'vendor', align: 'center',title: '渚涘簲鍟�'}
,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
,{field: 'color', align: 'center',title: '棰滆壊'}
diff --git a/version/db/sxjzasrs20220211.bak b/version/db/sxjzasrs20220211.bak
index 387ba0e..e39888c 100644
--- a/version/db/sxjzasrs20220211.bak
+++ b/version/db/sxjzasrs20220211.bak
Binary files differ
--
Gitblit v1.9.1