From 162b2345e5cae6ad327b5e931d9459c0cb6843e1 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 26 一月 2022 08:07:06 +0800
Subject: [PATCH] 更新
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 20 ++++++
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 10 +++
src/main/webapp/views/wrkMast/wrkDetl.html | 13 ++++
src/main/webapp/views/report/locDetl.html | 14 ++++
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 10 +++
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 11 +++
src/main/java/com/zy/asrs/entity/MatCodeCountDto.java | 18 ++++++
src/main/webapp/views/pakStore/locDetlQuery.html | 13 ++++
src/main/webapp/views/pda/comb.html | 5 +
src/main/java/com/zy/asrs/controller/MobileController.java | 1
src/main/webapp/static/js/stoMan/stoQue.js | 1
src/main/java/com/zy/asrs/controller/WorkController.java | 1
src/main/webapp/static/js/pakStore/stockOut.js | 12 +++
src/main/webapp/views/pakStore/matQuery.html | 4 +
src/main/webapp/views/pda/matQuery.html | 13 ++++
src/main/webapp/static/js/locDetl/locDetl.js | 14 ++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 3
src/main/webapp/static/js/common.js | 1
src/main/webapp/static/js/pakStore/pakStore.js | 12 +++
src/main/resources/application.yml | 2
src/main/webapp/static/js/wrkDetl/wrkDetl.js | 1
21 files changed, 166 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index e7c2ca6..c771051 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -58,6 +58,7 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
+ System.out.println("combParam = " + combParam);
mobileService.comb(combParam, getUserId());
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index ee38bfa..e0f3e56 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -77,6 +77,7 @@
@RequestMapping("/full/store/put/start")
@ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
+
return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
}
diff --git a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
index a31b6bf..40b0dae 100644
--- a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
+++ b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
@@ -14,6 +14,16 @@
private Double count;
private String supplier;
+
+ private String memo;
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
public MatCodeCountDto() {
}
@@ -21,6 +31,13 @@
public MatCodeCountDto(String matNo, Double count) {
this.matNo = matNo;
this.count = count;
+ }
+
+ public MatCodeCountDto(String matNo, String supplier, Double count, String memo) {
+ this.matNo = matNo;
+ this.count = count;
+ this.supplier = supplier;
+ this.memo = memo;
}
public MatCodeCountDto(String matNo, String supplier, Double count) {
@@ -36,6 +53,7 @@
this.supplier = supplier;
this.seqNo = seqNo;
}
+
public String getBillNo() { return billNo; }
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 48d8d66..1c0a37c 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -13,6 +13,26 @@
private List<CombMat> combMats;
private String billNo;
+
+ private String supplier;
+
+ private String memo;
+
+ public String getSupplier() {
+ return supplier;
+ }
+
+ public void setSupplier(String supplier) {
+ this.supplier = supplier;
+ }
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
public static class CombMat {
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 856e3e6..2b044e4 100644
--- a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -33,6 +33,16 @@
// 鎵瑰彿
private String supplier;
+ private String memo;
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
public String getBillNo() { return billNo; }
public void setBillNo(String billNo) { this.billNo = billNo; }
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 1662d13..a8c9883 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()));
+ matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getSupplier(), elem.getCount(),elem.getMemo()));
});
wrkDetlService.createWorkDetail(workNo, matDtos, param.getBarcode(), userId);
// 鏇存柊婧愮珯鐐逛俊鎭�
@@ -276,6 +276,7 @@
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(new Date());
wrkDetl.setModiUser(userId);
+ wrkDetl.setMemo(detlDto.getLocDetl().getMemo());
if (!wrkDetlService.insert(wrkDetl)) {
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 b0d7609..8ca4135 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -15,6 +15,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -43,10 +45,17 @@
VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
wrkDetl.setBillNo((null != dto.getBillNo()) ? dto.getBillNo() : "0");
wrkDetl.setSeqNo((null != dto.getSeqNo()) ? dto.getSeqNo() : 0);
- wrkDetl.setSupplier(dto.getSupplier());
+ if (Cools.isEmpty(dto.getSupplier())){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ dto.setSupplier(sdf.format(new Date()));
+ }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 (!this.insert(wrkDetl)) {
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 29254d5..2e0151d 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.Cools;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
@@ -103,11 +104,20 @@
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
} else {
+ WrkDetl wrk_no = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
+ .eq("wrk_no", wrkMast.getWrkNo()));
+
locDetl = new LocDetl();
+
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+ locDetl.setMemo(wrkMast.getMemo());
VersionUtils.setLocDetl(locDetl, wrkDetl); // 鐗堟湰鎺у埗
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+ if (!Cools.isEmpty(wrk_no)){
+ locDetl.setMemo(wrk_no.getMemo());
+ locDetl.setSupplier(wrk_no.getSupplier());
+ }
if (!locDetlService.insert(locDetl)) {
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 12005de..e4c216a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -21,7 +21,7 @@
#password: eisoft
url: jdbc:sqlserver://localhost:1433;databasename=sxjzasrs
username: sa
- password: sa@123
+ password: qq0901593322
mvc:
static-path-pattern: /**
redis:
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 9837a2a..4ce17c0 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -174,6 +174,7 @@
// ,{field: 'num1', align: 'center',title: '鏁伴噺'}
,{field: 'size', align: 'center',title: '灏哄', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊'}
+
]
var detlCols = [
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index eca2026..3697a85 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -1,7 +1,17 @@
var pageCurr;
function getCol() {
- var cols = [{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}];
- cols.push.apply(cols, detlCols);
+ var cols = [{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
+ {field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
+ ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
+ ,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'color', align: 'center',title: '棰滆壊'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ // ,{field: 'bname', align: 'center',title: '搴撲綅鍚嶇О'}
+ ,{field: 'memo', 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 ff48a22..459fb05 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -45,6 +45,13 @@
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"]==='')){
+ matCodeData[i]["supplier"] = obj.data.supplier;
+ }
+ }
break
}
@@ -72,6 +79,8 @@
return;
}
}
+ console.log(matCodeData);
+ debugger
$.ajax({
url: baseUrl+"/full/store/put/start",
headers: {'token': localStorage.getItem('token')},
@@ -128,7 +137,7 @@
yes: function(index, layero){
var memo = layer.getChildFrame('body', index).find("#memo")[0].value;
matCodeData.map(function (item) {
- if (item.matNo === data.matNo) {
+ if (item.matNo === data.matNo && item.supplier === data.supplier) {
item.memo = memo;
}
});
@@ -163,6 +172,7 @@
for (var i=0;i<matCodeData.length;i++){
if (matCodeData[i]["matNo"] === matNo && matCodeData[i]["supplier"] === supplier){
matCodeData[i]["count"] = count;
+ // matCodeData[i]["supplier"] = supplier;
}
}
} else {
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index 5fa0175..5919d4d 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -5,9 +5,19 @@
// {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
{field: 'anfme', align: 'center',title: '鍑哄簱鏁伴噺',edit:'text',style:'color: blue;font-weight: bold'}
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ , {field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
+ ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
+ ,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'color', align: 'center',title: '棰滆壊'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ // ,{field: 'bname', align: 'center',title: '搴撲綅鍚嶇О'}
+ ,{field: 'memo', align: 'center',title: '鐢熶骇鏃ユ湡'}
];
//arrRemove(detlCols, 'field', 'qty');
- cols.push.apply(cols, detlCols);
+ // cols.push.apply(cols, detlCols);
// cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
return cols;
}
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 1556e3e..f9d844e 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -40,6 +40,7 @@
html += "disabled='disabled' >";
return html;
},width:80}
+
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180}
,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
diff --git a/src/main/webapp/static/js/wrkDetl/wrkDetl.js b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
index dc0ee9a..0776136 100644
--- a/src/main/webapp/static/js/wrkDetl/wrkDetl.js
+++ b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
@@ -3,6 +3,7 @@
var cols = [
{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width: 160}
+
];
cols.push.apply(cols, detlCols);
cols.push(
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index e54f92e..dcdcab7 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -97,8 +97,19 @@
var cols = [
{type: 'checkbox'}
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
+ ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
+ ,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'color', align: 'center',title: '棰滆壊'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ // ,{field: 'bname', align: 'center',title: '搴撲綅鍚嶇О'}
+ ,{field: 'memo', align: 'center',title: '鐢熶骇鏃ユ湡'}
];
- cols.push.apply(cols, detlCols);
+ // cols.push.apply(cols, detlCols);
+
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
return cols;
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index e923846..b01d0bd 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -123,6 +123,10 @@
table.on('toolbar(matCode)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
var data = checkStatus.data;
+ for(i=0;i<data.length;i++){
+ data[i].supplier='';
+ }
+ // debugger
switch(obj.event) {
case 'confirm':
if (data.length === 0){
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 817e5e8..28825c2 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -56,7 +56,10 @@
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
{field: 'matNo', align: 'center', title: '浜у搧浠ｅ彿'},
- {field: 'matName', align: 'center', title: '浜у搧鍚嶇О'}
+ {field: 'matName', align: 'center', title: '浜у搧鍚嶇О'},
+ {field: 'supplier', align: 'center', title: '鎵瑰彿'},
+ {field: 'memo', align: 'center', title: '鐢熶骇鏃ユ湡'}
+
]],
done: function (res, curr, count) {
}
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 2ab8c70..4a43482 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -89,6 +89,14 @@
<input id="specs" type="text" disabled="disabled">
</div>
<div class="form-item">
+ <span>鎵瑰彿</span>
+ <input id="supplier" type="text">
+ </div>
+ <div class="form-item">
+ <span>鐢熶骇鏃ユ湡</span>
+ <input id="memo" type="text">
+ </div>
+ <div class="form-item">
<span>鍗曚綅</span>
<input id="unit" type="text" disabled="disabled">
</div>
@@ -146,7 +154,10 @@
var data = {
matNo: $('#matNo').val(),
matName: $('#matName').val(),
- count: countDom.val()
+ count: countDom.val(),
+ supplier: $('#supplier').val(),
+ memo: $('#memo').val()
+
};
parent.addTableData(data);
parent.layer.close(parent.matCodeLayerIdx);
diff --git a/src/main/webapp/views/report/locDetl.html b/src/main/webapp/views/report/locDetl.html
index 0b77d23..477e401 100644
--- a/src/main/webapp/views/report/locDetl.html
+++ b/src/main/webapp/views/report/locDetl.html
@@ -33,9 +33,19 @@
var pageCur;
function getCol() {
var cols = [
- {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
+ {field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
+ ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
+ ,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'color', align: 'center',title: '棰滆壊'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ // ,{field: 'bname', align: 'center',title: '搴撲綅鍚嶇О'}
+ ,{field: 'memo', align: 'center',title: '鐢熶骇鏃ユ湡'}
];
- cols.push.apply(cols, detlCols);
+ // cols.push.apply(cols, detlCols);
return cols;
}
layui.use(['table','laydate', 'form'], function() {
diff --git a/src/main/webapp/views/wrkMast/wrkDetl.html b/src/main/webapp/views/wrkMast/wrkDetl.html
index e5567b9..07195be 100644
--- a/src/main/webapp/views/wrkMast/wrkDetl.html
+++ b/src/main/webapp/views/wrkMast/wrkDetl.html
@@ -32,8 +32,19 @@
var cols = [
{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
+ ,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
+ ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
+ ,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'color', align: 'center',title: '棰滆壊'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ // ,{field: 'bname', align: 'center',title: '搴撲綅鍚嶇О'}
+ ,{field: 'memo', align: 'center',title: '鐢熶骇鏃ユ湡'}
];
- cols.push.apply(cols, detlCols);
+ // cols.push.apply(cols, detlCols);
+
cols.push({field: 'billNo', title:'鍗曟嵁缂栧彿', align: 'center'}
,{field: 'seqNo', title:'搴忓彿', align: 'center', width:80});
return cols;
--
Gitblit v1.9.1