From 7182f72ba4781c620eebdf501ca46b3f69f5585d Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期二, 15 二月 2022 11:11:09 +0800
Subject: [PATCH] 字段添加完成，测试完成
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 5 +
src/main/resources/mapper/WrkDetlLogMapper.xml | 1
src/main/webapp/views/wrkMast/wrkDetl.html | 8 +-
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/webapp/views/report/locDetl.html | 8 +-
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 18 ++++--
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 2
src/main/resources/mapper/LocDetlMapper.xml | 1
src/main/java/com/zy/asrs/entity/MatCodeCountDto.java | 23 +++++--
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 4
src/main/java/com/zy/common/web/WcsController.java | 2
src/main/webapp/static/js/locDetl/locDetl.js | 8 +-
src/main/resources/mapper/WrkDetlMapper.xml | 1
src/main/webapp/static/js/pltBarcode/pltBarcode.js | 4
version/db/sxjzasrs20220211.bak | 0
src/main/java/com/zy/asrs/entity/LocDetl.java | 4 +
version/db/捷众数据库增加字段列表.txt | 4
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2
src/main/java/com/zy/asrs/entity/WrkDetl.java | 3 +
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 1
src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js | 6 +
src/main/webapp/static/js/pakStore/pakStore.js | 22 ++++++-
22 files changed, 93 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 0d2f747..7dea595 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -111,6 +111,10 @@
@TableField("vendor")
private String vendor;
+ @ApiModelProperty(value= "姣忕鏁伴噺")
+ @TableField("qty_box")
+ private Double qtyBox;
+
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/MatCodeCountDto.java b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
index d080d53..39178ce 100644
--- a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
+++ b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
@@ -39,25 +39,38 @@
this.memo = memo;
}
- public MatCodeCountDto() {
- }
+
public MatCodeCountDto(String matNo, Double count) {
this.matNo = matNo;
this.count = count;
}
- public MatCodeCountDto(String matNo, String supplier, Double count, String memo) {
+ public MatCodeCountDto(String matNo, String supplier, Double count, String memo,String source, String vendor) {
this.matNo = matNo;
this.count = count;
this.supplier = supplier;
this.memo = memo;
+ this.source = source;
+ this.vendor= vendor;
}
- public MatCodeCountDto(String matNo, String supplier, Double count) {
+ public MatCodeCountDto(String matNo, String supplier, Double count,String source, String vendor) {
this.matNo = matNo;
this.supplier = supplier;
this.count = count;
+ this.source = source;
+ this.vendor= vendor;
+ }
+
+ public MatCodeCountDto(String billNo, Integer seqNo, String matNo, String supplier, Double count,String source, String vendor) {
+ this.matNo = matNo;
+ this.count = count;
+ this.billNo = billNo;
+ this.supplier = supplier;
+ this.seqNo = seqNo;
+ this.source = source;
+ this.vendor= vendor;
}
public MatCodeCountDto(String billNo, Integer seqNo, String matNo, String supplier, Double count) {
@@ -67,8 +80,6 @@
this.supplier = supplier;
this.seqNo = seqNo;
}
-
-
public String getBillNo() { return billNo; }
public void setBillNo(String billNo) { this.billNo = billNo; }
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 73176b9..161f657 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -163,6 +163,9 @@
@TableField("vendor")
private String vendor;
+ @ApiModelProperty(value= "姣忕鏁伴噺")
+ @TableField("qty_box")
+ private Double qtyBox;
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 680ee94..d8d60d5 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -156,7 +156,10 @@
@ApiModelProperty(value= "渚涘簲鍟�")
@TableField("vendor")
private String vendor;
-
+ @ApiModelProperty(value = "姣忕鏁伴噺")
+ @TableField("qty_box")
+ private Double qtyBox;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 381823c..a5112fe 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -15,7 +15,7 @@
/**
* 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滄暟閲忎负0锛屽垯鍒犻櫎璁板綍
*/
- boolean updateAnfme(Double qty, String locNo, String matNo);
+ boolean updateAnfme(Double qty, String locNo, String matNo,String supplier);
boolean updateLocNo(String newLocNo, String oldLocNo);
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index bb4ef0f..8bc0d00 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -26,9 +26,9 @@
}
@Override
- public boolean updateAnfme(Double qty, String locNo, String matNo) {
+ public boolean updateAnfme(Double qty, String locNo, String matNo,String supplier) {
if (qty <= 0) {
- return delete(new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("mat_no", matNo));
+ return delete(new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("mat_no", matNo).eq("supplier",supplier));
} else {
int res = baseMapper.updateAnfme(qty, locNo, matNo);
return res > 0;
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 98cf0ee..925a011 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -166,6 +166,7 @@
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("淇濆瓨鏁版嵁澶辫触");
}
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 998769d..e604b6d 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -125,7 +125,7 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
List<MatCodeCountDto> matDtos = new ArrayList<>();
param.getList().forEach(elem -> {
- matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getSupplier(), elem.getCount(),elem.getMemo()));
+ matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getSupplier(), elem.getCount(),elem.getMemo(),elem.getSource(),elem.getVendor()));
});
wrkDetlService.createWorkDetail(workNo, matDtos, param.getBarcode(), userId);
// 鏇存柊婧愮珯鐐逛俊鎭�
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 84e51bb..8e15c5b 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -68,6 +68,8 @@
wrkDetl.setAllWeight(matCode.getWeight()*dto.getCount()+30);
wrkDetl.setSource(dto.getSource());
wrkDetl.setVendor(dto.getVendor());
+ wrkDetl.setWeight(matCode.getWeight());
+ wrkDetl.setQtyBox(matCode.getStr6());
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 615bd67..9624c2e 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -44,7 +44,8 @@
private IoCompleteService ioCompleteService;
@Autowired
private PltBarcodeService pltBarcodeService;
-
+ @Autowired
+ private MatCodeService matCodeService;
/**
* ERP鎺ュ彛鏄惁鍚敤
*/
@@ -99,14 +100,17 @@
for (WrkDetl wrkDetl : wrkDetls) {
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()).eq("supplier", wrkDetl.getSupplier()));
if (null != locDetl) {
- boolean res = locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), wrkMast.getLocNo(), wrkDetl.getMatNo());
+ boolean res = locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), wrkMast.getLocNo(), wrkDetl.getMatNo(),wrkDetl.getSupplier());
+
+
if (!res) {
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
} else {
WrkDetl wrk_no = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
- .eq("wrk_no", wrkMast.getWrkNo()));
-
+ .eq("wrk_no", wrkMast.getWrkNo()).eq("mat_no",wrkDetl.getMatNo()).eq("supplier",wrkDetl.getSupplier()));
+
+ MatCode matCode = matCodeService.selectOne(new EntityWrapper<MatCode>().eq("mat_no", wrkDetl.getMatNo()));
locDetl = new LocDetl();
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
@@ -118,6 +122,8 @@
locDetl.setAllWeight(wrk_no.getAllWeight());
locDetl.setSource(wrk_no.getSource());
locDetl.setVendor(wrk_no.getVendor());
+ locDetl.setWeight(matCode.getWeight());
+ locDetl.setQtyBox(matCode.getStr6());
if (!Cools.isEmpty(wrk_no)){
locDetl.setMemo(wrk_no.getMemo());
locDetl.setSupplier(wrk_no.getSupplier());
@@ -194,7 +200,7 @@
// 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滃伐浣滄槑缁嗘暟閲忎负0鏃讹紝鍒犻櫎搴撳瓨鏄庣粏
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()));
if (null != locDetl) {
- if (!locDetlService.updateAnfme(locDetl.getQty() - wrkDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo())) {
+ if (!locDetlService.updateAnfme(locDetl.getQty() - wrkDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo(),wrkDetl.getSupplier())) {
exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
@@ -253,7 +259,7 @@
for (WrkDetl wrkDetl:wrkDetls54) {
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()));
if (null != locDetl) {
- if (!locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo())) {
+ if (!locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo(),wrkDetl.getSupplier())) {
exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[matNo={1}]", wrkMast.getWrkNo(), wrkDetl.getMatNo());
}
} else {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 1cb5260..d8fcf6a 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -140,7 +140,7 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
List<MatCodeCountDto> matDtos = new ArrayList<>();
pltBarcodes.forEach(elem -> {
- matDtos.add(new MatCodeCountDto(elem.getBillNo(), elem.getSeqNo(), elem.getMatNo(), null, elem.getQty()));
+ matDtos.add(new MatCodeCountDto(elem.getBillNo(), elem.getSeqNo(), elem.getMatNo(), null, elem.getQty(),elem.getSource(),elem.getVendor()));
//鏇存柊缁勬墭鏁版嵁鐘舵�佷负鍏ュ簱涓�
Wrapper<PltBarcode> wrapper = new EntityWrapper<PltBarcode>().eq("barcode", elem.getBarcode())
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 6efd347..f1e3b26 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -27,6 +27,7 @@
<result column="all_weight" property="allWeight"/>
<result column="source" property="source" />
<result column="vendor" property="vendor" />
+ <result column="qty_box" property="qtyBox"/>
</resultMap>
<sql id="stockOutCondition">
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index 765c96e..11ad26e 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -29,6 +29,7 @@
<result column="all_weight" property="allWeight"/>
<result column="source" property="source" />
<result column="vendor" property="vendor" />
+ <result column="qty_box" property="qtyBox"/>
</resultMap>
</mapper>
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index ffe9156..b7f75cd 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -29,6 +29,7 @@
<result column="all_weight" property="allWeight"/>
<result column="source" property="source" />
<result column="vendor" property="vendor" />
+ <result column="qty_box" property="qtyBox"/>
</resultMap>
<select id="queryWrkDetl" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 4631d76..f0deea4 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -4,9 +4,11 @@
{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
,{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: 'qty', align: 'center',title: '鍏ュ簱鏁伴噺'}
+ ,{field: 'qtyBox', align: 'center',title: '姣忕鏁伴噺(PCS)'}
+ ,{field: 'allQty', align: 'center',title: '鎬绘暟閲�(PCS)'}
+ ,{field: 'weight', align: 'center',title: '姣忕閲嶉噺(KG)'}
+ ,{field: 'allWeight', align: 'center',title: '鎬婚噸閲�(KG)'}
,{field: 'source', align: 'center',title: '鏉ユ簮'}
,{field: 'vendor', align: 'center',title: '渚涘簲鍟�'}
,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 822ccd4..fefffe9 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -6,9 +6,9 @@
{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: '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'}
+ {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(
@@ -57,6 +57,22 @@
}
}
break
+ case 'source':
+ 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]["source"] = obj.data.source;
+ }
+ }
+ break;
+ case 'vendor':
+ 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]["vendor"] = obj.data.vendor;
+ }
+ }
+ break;
}
});
diff --git a/src/main/webapp/static/js/pltBarcode/pltBarcode.js b/src/main/webapp/static/js/pltBarcode/pltBarcode.js
index b5d1951..48c8ee1 100644
--- a/src/main/webapp/static/js/pltBarcode/pltBarcode.js
+++ b/src/main/webapp/static/js/pltBarcode/pltBarcode.js
@@ -28,8 +28,8 @@
,{field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
,{field: 'qty', align: 'center',title: '鍏ュ簱鏁伴噺'}
- ,{field: 'qtyBox', align: 'center',title: '姣忕鏁伴噺'}
- ,{field: 'allQty', align: 'center',title: '鎬绘暟閲�'}
+ ,{field: 'qtyBox', align: 'center',title: '姣忕鏁伴噺(PCS)'}
+ ,{field: 'allQty', align: 'center',title: '鎬绘暟閲�(PCS)'}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
diff --git a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
index 39a75d4..c1cd2e4 100644
--- a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
+++ b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
@@ -3,8 +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: 'qtyBox', align: 'center',title: '姣忕鏁伴噺(PCS)'}
+ ,{field: 'allQty', align: 'center',title: '鎬绘暟閲�(PCS)'}
+ ,{field: 'weight', align: 'center',title: '姣忕閲嶉噺(KG)'}
+ ,{field: 'allWeight', align: 'center',title: '鎬婚噸閲�(KG)'}
,{field: 'source', align: 'center',title: '鏉ユ簮'}
,{field: 'vendor', align: 'center',title: '渚涘簲鍟�'}
];
diff --git a/src/main/webapp/views/report/locDetl.html b/src/main/webapp/views/report/locDetl.html
index cf2a497..e26666c 100644
--- a/src/main/webapp/views/report/locDetl.html
+++ b/src/main/webapp/views/report/locDetl.html
@@ -37,9 +37,11 @@
{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
,{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: 'qty', align: 'center',title: '鍏ュ簱鏁伴噺'}
+ ,{field: 'qtyBox', align: 'center',title: '姣忕鏁伴噺(PCS)'}
+ ,{field: 'allQty', align: 'center',title: '鎬绘暟閲�(PCS)'}
+ ,{field: 'weight', align: 'center',title: '姣忕閲嶉噺(KG)'}
+ ,{field: 'allWeight', align: 'center',title: '鎬婚噸閲�(KG)'}
,{field: 'source', align: 'center',title: '鏉ユ簮'}
,{field: 'vendor', align: 'center',title: '渚涘簲鍟�'}
,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
diff --git a/src/main/webapp/views/wrkMast/wrkDetl.html b/src/main/webapp/views/wrkMast/wrkDetl.html
index e8dff51..1709786 100644
--- a/src/main/webapp/views/wrkMast/wrkDetl.html
+++ b/src/main/webapp/views/wrkMast/wrkDetl.html
@@ -35,9 +35,11 @@
,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
,{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: 'qty', align: 'center',title: '鍏ュ簱鏁伴噺'}
+ ,{field: 'qtyBox', align: 'center',title: '姣忕鏁伴噺(PCS)'}
+ ,{field: 'allQty', align: 'center',title: '鎬绘暟閲�(PCS)'}
+ ,{field: 'weight', align: 'center',title: '姣忕閲嶉噺(KG)'}
+ ,{field: 'allWeight', align: 'center',title: '鎬婚噸閲�(KG)'}
,{field: 'source', align: 'center',title: '鏉ユ簮'}
,{field: 'vendor', align: 'center',title: '渚涘簲鍟�'}
,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
diff --git a/version/db/sxjzasrs20220211.bak b/version/db/sxjzasrs20220211.bak
index e39888c..31d6cdc 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 7355a71..8fb1605 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"
@@ -4,10 +4,10 @@
宸ヤ綔妗ｏ紙wrk_detl鍜寃rk_detl_log锛夋湁锛歛ll_qty(鎬绘暟閲忥紝娴偣绫诲瀷) all_weight(鎬婚噸閲忥紝娴偣绫诲瀷)
-source(鏉ユ簮锛屽瓧绗︿覆) vendor(渚涘簲鍟嗭紝瀛楃涓�)
+source(鏉ユ簮锛屽瓧绗︿覆) vendor(渚涘簲鍟嗭紝瀛楃涓�) qty_box(姣忕鏁伴噺锛屾诞鐐圭被鍨�)
搴撳瓨琛紙loc_detl锛夋湁锛歛ll_qty(鎬绘暟閲忥紝娴偣绫诲瀷) all_weight(鎬婚噸閲忥紝娴偣绫诲瀷)
-source(鏉ユ簮锛屽瓧绗︿覆) vendor(渚涘簲鍟嗭紝瀛楃涓�)
+source(鏉ユ簮锛屽瓧绗︿覆) vendor(渚涘簲鍟嗭紝瀛楃涓�) qty_box(姣忕鏁伴噺锛屾诞鐐圭被鍨�)
鐗╂枡琛紙mat_code锛夊彉鏇存湁锛歴tr3锛堝鎴峰悕绉帮紝瀛楃涓诧級 str4锛堥」鐩俊鎭紝瀛楃涓诧級 str5锛堢被鍒紝瀛楃涓诧級
--
Gitblit v1.9.1