From a0d7fdd303b3f76131d77162a7dd2c7db60d80ae Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 24 一月 2024 19:12:26 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js | 8 +-
src/main/resources/mapper/LocDetlMapper.xml | 3
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 8 +-
src/main/webapp/static/js/saas/locDetl.js | 4
src/main/java/com/zy/common/model/LocDto.java | 21 +++++++
src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 2
src/main/webapp/static/js/orderDetl/orderDetl.js | 1
src/main/webapp/static/js/locDetl/locDetl.js | 8 +-
src/main/java/com/zy/asrs/entity/WaitPakin.java | 4
src/main/java/com/zy/asrs/entity/LocDetl.java | 18 +++---
src/main/webapp/static/js/adjDetl/adjDetl.js | 1
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 11 ++-
src/main/webapp/static/js/common.js | 28 ++++----
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 22 +++++--
14 files changed, 86 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index acdcd54..03aa67d 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -37,34 +37,34 @@
@ExcelProperty("鏁伴噺")
private Double anfme;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @ExcelProperty("鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "瑙勬牸")
+ @ExcelProperty("瑙勬牸")
private String matnr;
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
@ExcelProperty("鍟嗗搧鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "瑙勬牸")
- @ExcelProperty("瑙勬牸")
+ @ApiModelProperty(value= "鎺ュご")
private String specs;
- @ApiModelProperty(value= "璐у搧鐗瑰緛")
- @ExcelProperty("璐у搧鐗瑰緛")
+ @ApiModelProperty(value= "绠卞彿")
+// @ExcelProperty("绠卞彿")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @ExcelProperty("鍗曟嵁缂栧彿")
+// @ExcelProperty("鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鍗峰彿")
private String model;
@ApiModelProperty(value= "棰滆壊")
private String color;
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "鏈ㄧ绫诲瀷")
+ @ExcelProperty("鏈ㄧ绫诲瀷")
private String brand;
@ApiModelProperty(value= "鍗曚綅")
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index c24dd70..4bae423 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -67,7 +67,7 @@
@ApiModelProperty(value= "鍗曚綅")
private String unit;
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value= "鍗曚环 闀垮害")
private Double price;
@ApiModelProperty(value= "sku")
@@ -106,7 +106,7 @@
@ApiModelProperty(value= "闀垮害")
private Double length;
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value= "浣撶Н 姣涢噸")
private Double volume;
@ApiModelProperty(value= "涓夋柟缂栫爜")
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 c0c1421..c9046a7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -460,9 +460,11 @@
}else if (Cools.isEmpty(matList.getWeight()) || matList.getWeight().equals(0D)){
throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍑�閲� weight涓虹┖");
}else if (Cools.isEmpty(matList.getRoughWeight()) || matList.getRoughWeight().equals(0D)){
- throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細姣涢噸 roughWeight");
+ throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細姣涢噸 roughWeight涓虹┖");
}else if (Cools.isEmpty(matList.getRollExtent()) || matList.getRollExtent().equals(0D)){
- throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗烽暱搴� rollExtent");
+ throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗烽暱搴� rollExtent涓虹┖");
+ }else if (Cools.isEmpty(matList.getJoint()) || matList.getJoint()==0){
+ throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鎺ュご joint涓虹┖");
}
if (matList.getPosition().equals("1")){//1銆佸乏 2銆佸彸
@@ -533,8 +535,9 @@
waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
waitPakin.setOrigin(matList.getPosition()); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
waitPakin.setWeight(matList.getWeight()); //鍑�閲�
-// waitPakin.setRoughWeight(matList.getRoughWeight()); //姣涢噸
-// waitPakin.setRollExtent(matList.getRollExtent()); //闀垮害
+ waitPakin.setVolume(matList.getRoughWeight()); //姣涢噸
+ waitPakin.setPrice(matList.getRollExtent()); //闀垮害
+ waitPakin.setSpecs(String.valueOf(matList.getJoint())); //闀垮害
waitPakin.setIoStatus("Y"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(matList.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
diff --git a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
index d17771d..b24e75d 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
@@ -72,7 +72,7 @@
if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()!=0){ //涓婁紶鍓嶅伐浣滃彿璺熺數鎺х害瀹氫负9992涓帶(妗佹灦)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭紙浣犲彲浠ヨ嚜瀹氫箟锛�
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
- if (Cools.isEmpty(wrkMast) || !wrkMast.getSheetNo().equals("0")){
+ if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("0")){
return FAIL;
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index d915152..d78fcbe 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -31,6 +31,7 @@
public class OutLocBoxExcelListener extends AnalysisEventListener<OutLocBoxExcel> {
private int total = 0;
+ private String orderOneNo = null;
private Long userId;
List<String[]> OutLocBoxCs = new ArrayList<>();
@@ -62,9 +63,16 @@
public void invoke(OutLocBoxExcel excel, AnalysisContext ctx) {
String batch = excel.getBatch();
String orderNo = excel.getOrderNo();
+ if (Cools.isEmpty(orderOneNo)){
+ if (!Cools.isEmpty(excel.getOrderNo())){
+ orderOneNo = excel.getOrderNo();
+ } else {
+ throw new CoolException("璁㈠崟鍙峰弬鏁颁负绌�");
+ }
+ }
String[] s=new String[2];
s[0] = batch;
- s[1] = orderNo;
+ s[1] = orderOneNo;
OutLocBoxCs.add(s);
total++;
}
@@ -101,10 +109,11 @@
total--;
continue;
}
- LocDto locDto = new LocDto(locDetl.getManu(), locDetl.getMatnr(), locDetl.getMaktx(),locDetl.getModel(),locDetl.getSpecs(),
- locDetl.getBatch(),locDetl.getBrand(),locDetl.getBarcode(), outLocBoxC[1],locDetl.getAnfme());
- locDto.setOrigin(locDetl.getOrigin());
- locDto.setWeight(locDetl.getWeight());
+// LocDto locDto = new LocDto(locDetl.getManu(), locDetl.getMatnr(), locDetl.getMaktx(),locDetl.getModel(),locDetl.getSpecs(),
+// locDetl.getBatch(),locDetl.getBrand(),locDetl.getBarcode(), outLocBoxC[1],locDetl.getAnfme());
+// locDto.setOrigin(locDetl.getOrigin());
+// locDto.setWeight(locDetl.getWeight());
+ LocDto locDto = new LocDto(locDetl);
locDtos.add(locDto);
}
@@ -123,11 +132,10 @@
locDetl.setOrigin(locDto.getOrigin());
locDetl.setWeight(locDto.getWeight());
- param.setOrderNo(locDto.getOrderNo());
-
locDetls.add(locDetl);
}
param.setLocDetls(locDetls);
+ param.setOrderNo(orderOneNo);
if (total>0){
workService.startupFullTakeStoreOrder(param,9999L);
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index 3a31a61..de1a694 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -1,6 +1,7 @@
package com.zy.common.model;
import com.core.common.Cools;
+import com.zy.asrs.entity.LocDetl;
import lombok.Data;
import java.util.List;
@@ -36,6 +37,8 @@
private Double anfme;
private Double count;
private Double weight;
+ private Double volume;
+ private Double price;
private boolean lack = false;
@@ -90,6 +93,24 @@
this.zpallet = zpallet;
}
+ public LocDto(LocDetl locDetl) {
+ this.locNo = locDetl.getLocNo();
+ this.matnr = locDetl.getMatnr();
+ this.maktx = locDetl.getMaktx();
+ this.batch = locDetl.getBatch();
+ this.orderNo = locDetl.getOrderNo();
+ this.anfme = locDetl.getAnfme();
+ this.count = locDetl.getAnfme();
+ this.model = locDetl.getModel();
+ this.specs = locDetl.getSpecs();
+ this.brand = locDetl.getBrand();
+ this.zpallet = locDetl.getZpallet();
+ this.weight = locDetl.getWeight();
+ this.volume = locDetl.getVolume();
+ this.price = locDetl.getPrice();
+ this.origin = locDetl.getOrigin();
+ }
+
public String getTitle() {
return this.matnr + "锛�" + this.maktx + "锛�";
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index e1e20a8..adb8138 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -142,12 +142,11 @@
select
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
- , a.batch
, sum(a.anfme) as anfme
from asr_loc_detl a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr, a.batch
+ group by a.matnr
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
diff --git a/src/main/webapp/static/js/adjDetl/adjDetl.js b/src/main/webapp/static/js/adjDetl/adjDetl.js
index 443bf04..92e646c 100644
--- a/src/main/webapp/static/js/adjDetl/adjDetl.js
+++ b/src/main/webapp/static/js/adjDetl/adjDetl.js
@@ -30,6 +30,7 @@
// ,{field: 'oriWt', align: 'center',title: '鍘熼噸閲�'}
// ,{field: 'adjCtns', align: 'center',title: '鍙樻洿绠辨暟'}
,{field: 'adjQty', align: 'center',title: '鍙樻洿鏁伴噺'}
+ ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: false}
// ,{field: 'adjWt', align: 'center',title: '鍙樻洿閲嶉噺'}
,{field: 'memo', align: 'center',title: '澶囨敞',hide:true}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 64039c1..d685b41 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -193,7 +193,7 @@
,{field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}
,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
- ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+ ,{field: 'price', align: 'center',title: '闀垮害', hide: false}
,{field: 'sku', align: 'center',title: '鏈ㄧ缂栫爜', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
@@ -203,8 +203,8 @@
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
+ // ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
+ ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
@@ -223,20 +223,20 @@
]
var detlCols = [
- {field: 'matnr', align: 'center',title: '瑙勬牸', sort:true}
- ,{field: 'maktx', align: 'center',title: '鍝佸悕', sort:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '绠卞彿', hide: false, sort:true}
+ {field: 'matnr', align: 'center',title: '瑙勬牸', sort:true, hide: false}
+ ,{field: 'maktx', align: 'center',title: '鍝佸悕', sort:true, hide: true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'batch', align: 'center',title: '绠卞彿', hide: true, sort:true}
,{field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true, sort:true}
,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false, sort:true}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: true}
- ,{field: 'specs', align: 'center',title: '鎺ュご', hide: false}
- ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
+ ,{field: 'specs', align: 'center',title: '鎺ュご', hide: true}
+ ,{field: 'model', align: 'center',title: '鍗峰彿', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
- ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ ,{field: 'price', align: 'center',title: '闀垮害', hide: false}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
@@ -246,8 +246,8 @@
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: false, sort:true}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
+ // ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
+ ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index e829469..5e624fb 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -4,7 +4,7 @@
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
{field: 'matnr', align: 'center',title: '瑙勬牸', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'batch', align: 'center',title: '绠卞彿', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
@@ -14,7 +14,7 @@
,{field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}
,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+ ,{field: 'price', align: 'center',title: '闀垮害', hide: false}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
@@ -24,8 +24,8 @@
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
+ // ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
+ ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index 89b8ed2..7744711 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -4,7 +4,7 @@
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
{field: 'matnr', align: 'center',title: '瑙勬牸', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'batch', align: 'center',title: '绠卞彿', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
//,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
@@ -14,7 +14,7 @@
,{field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}
,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+ ,{field: 'price', align: 'center',title: '闀垮害', hide: false}
,{field: 'sku', align: 'center',title: '鏈ㄧ缂栫爜', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
@@ -24,8 +24,8 @@
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
+ // ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
+ ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index 515a1d9..78e537b 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -36,6 +36,7 @@
,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
,{field: 'unitPrice', align: 'center',title: '鍗曚环'}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
+ ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: false}
,{field: 'count', align: 'center',title: '鏁伴噺'}
,{field: 'weight', align: 'center',title: '閲嶉噺'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js
index 933eda6..4358fc9 100644
--- a/src/main/webapp/static/js/saas/locDetl.js
+++ b/src/main/webapp/static/js/saas/locDetl.js
@@ -14,7 +14,7 @@
,{field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}
,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+ ,{field: 'price', align: 'center',title: '闀垮害', hide: false}
,{field: 'sku', align: 'center',title: '鏈ㄧ缂栫爜', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
@@ -26,7 +26,7 @@
,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
,{field: 'roughWeight', align: 'center',title: '鍗曠姣涢噸', hide: true}
// ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
+ ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
diff --git a/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js b/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js
index f0e04fc..2103c50 100644
--- a/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js
+++ b/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js
@@ -29,14 +29,14 @@
,{field: 'matnr', align: 'center',title: '瑙勬牸'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'batch', align: 'center',title: '绠卞彿'}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿',hide: true}
,{field: 'specs', align: 'center',title: '鎺ュご'}
,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊'}
,{field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}
,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
- ,{field: 'price', align: 'center',title: '鍗曚环'}
+ ,{field: 'price', align: 'center',title: '闀垮害', hide: false}
,{field: 'sku', align: 'center',title: 'sku'}
,{field: 'units', align: 'center',title: '鍗曚綅閲�'}
,{field: 'barcode', align: 'center',title: '鏉＄爜'}
@@ -46,8 +46,8 @@
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�'}
,{field: 'weight', align: 'center',title: '閲嶉噺'}
- ,{field: 'length', align: 'center',title: '闀垮害'}
- ,{field: 'volume', align: 'center',title: '浣撶Н'}
+ // ,{field: 'length', align: 'center',title: '闀垮害'}
+ ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
,{field: 'threeCode', align: 'center',title: '涓夋柟缂栫爜'}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�'}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�'}
--
Gitblit v1.9.1