From c90f42702b056664dbb3502a14041ba902273665 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 27 十一月 2025 18:31:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 12 +-
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 5 +
src/main/java/com/zy/asrs/service/LocDetlService.java | 3
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 8 +
src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java | 2
src/main/webapp/views/order/order.html | 28 +++---
src/main/webapp/static/js/orderPakout/order.js | 9 +
src/main/webapp/static/js/order/out.js | 4
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 67 ++++++++++------
src/main/webapp/static/js/order/order.js | 14 +-
src/main/webapp/static/js/orderPakin/order.js | 7 +
src/main/java/com/zy/asrs/controller/OutController.java | 8 +
src/main/resources/application.yml | 4
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 17 +--
14 files changed, 107 insertions(+), 81 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 53170c6..59741ab 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -133,12 +133,12 @@
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
param.getDocType(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
- param.getStandby1(), //椤圭洰鍚嶇О 瀹㈡埛PO鍙�
+ null, //椤圭洰鍚嶇О 瀹㈡埛PO鍙�
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
null, // 瀹㈡埛缂栧彿
- locOwner.getOwner(), // 瀹㈡埛
+ null, // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
null, // 鎿嶄綔浜哄憳
null, // 鍚堣閲戦
@@ -189,10 +189,10 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
- orderDetl.setStandby1(param.getStandby1().toString());//po
- orderDetl.setBoxType1(locOwner.getId().toString());//璐т富ID
- orderDetl.setBoxType2(locOwner.getOwnerUuid().toString());//璐т富UUID
- orderDetl.setBoxType3(locOwner.getOwner());//璐т富
+// orderDetl.setStandby1(param.getStandby1().toString());//po
+// orderDetl.setBoxType1(locOwner.getId().toString());//璐т富ID
+// orderDetl.setBoxType2(locOwner.getOwnerUuid().toString());//璐т富UUID
+// orderDetl.setBoxType3(locOwner.getOwner());//璐т富
orderDetl.setPakinPakoutStatus(status);
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 60b2dec..bc6f66f 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -80,8 +80,10 @@
if (issued <= 0.0D) {
continue;
}
+// List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
+// orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
- orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
@@ -126,8 +128,10 @@
if (issued <= 0.0D) {
continue;
}
+// List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
+// orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
- orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index bbf8ac8..a8b4dc9 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -71,9 +71,12 @@
// -------------------------------------------------
List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
+// List<LocDetl> queryStockAll(@Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("matnr")String matnr, @Param("batch")String batch,
+// @Param("brand")String brand,@Param("standby1")String standby1,@Param("standby2")String standby2,
+// @Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2,@Param("boxType3")String boxType3);
List<LocDetl> queryStockAll(@Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("matnr")String matnr, @Param("batch")String batch,
@Param("brand")String brand,@Param("standby1")String standby1,@Param("standby2")String standby2,
- @Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2,@Param("boxType3")String boxType3);
+ @Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2);
Double queryStockAnfme(String matnr, String batch);
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 2bdc4f2..2fcf658 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -67,7 +67,8 @@
List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);
- List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
+// List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
+ List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2);
Double queryStockAnfme(String matnr, String batch);
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 2e14e9b..07306c3 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -113,9 +113,13 @@
+// @Override
+// public List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+// return this.baseMapper.queryStockAll(orderNo,locNos, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
+// }
@Override
- public List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- return this.baseMapper.queryStockAll(orderNo,locNos, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
+ public List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2) {
+ return this.baseMapper.queryStockAll(orderNo,locNos, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2);
}
@Override
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 a25fd6d..c9c1985 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -188,33 +188,37 @@
@Override
@Transactional
public void startupFullTakeStore(StockOutParam param, Long userId) {
- // 鐩爣绔欑偣鐘舵�佹娴�
- BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
- // 鑾峰彇搴撲綅鏄庣粏
- List<LocDetlDto> locDetlDtos = new ArrayList<>();
- for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
- if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
- LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch(),paramLocDetl.getBrand()
- ,paramLocDetl.getStandby1(),paramLocDetl.getStandby2(),paramLocDetl.getStandby3(),paramLocDetl.getBoxType1(),paramLocDetl.getBoxType2(),paramLocDetl.getBoxType3());
- if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
+ try{
+ // 鐩爣绔欑偣鐘舵�佹娴�
+ BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
+ // 鑾峰彇搴撲綅鏄庣粏
+ List<LocDetlDto> locDetlDtos = new ArrayList<>();
+ for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
+ if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
+ LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch(),paramLocDetl.getBrand()
+ ,paramLocDetl.getStandby1(),paramLocDetl.getStandby2(),paramLocDetl.getStandby3(),paramLocDetl.getBoxType1(),paramLocDetl.getBoxType2(),paramLocDetl.getBoxType3());
+ if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
+ }
}
- }
- if (!locDetlDtos.isEmpty()) {
- // 搴撲綅鍙烽泦鍚�
- List<String> locNoList = param.getLocDetls().stream().map(StockOutParam.LocDetl::getLocNo).distinct().collect(Collectors.toList());
- String firstFrozenLocNo = locMastMapper.findFirstFrozenLocNo(locNoList);
- if (firstFrozenLocNo != null) {
- throw new CoolException(firstFrozenLocNo + "搴撲綅宸茶鍐荤粨!");
+ if (!locDetlDtos.isEmpty()) {
+ // 搴撲綅鍙烽泦鍚�
+ List<String> locNoList = param.getLocDetls().stream().map(StockOutParam.LocDetl::getLocNo).distinct().collect(Collectors.toList());
+ String firstFrozenLocNo = locMastMapper.findFirstFrozenLocNo(locNoList);
+ if (firstFrozenLocNo != null) {
+ throw new CoolException(firstFrozenLocNo + "搴撲綅宸茶鍐荤粨!");
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
+ if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
+ // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
+ stockOut(staNo, locDetlDtos, null, userId);
+ }else {
+ throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎銆丏鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
+ }
+ } else {
+ throw new CoolException("搴撳瓨涓嶅瓨鍦�");
}
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
- if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
- // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
- stockOut(staNo, locDetlDtos, null, userId);
- }else {
- throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎銆丏鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
- }
- } else {
- throw new CoolException("搴撳瓨涓嶅瓨鍦�");
+ } catch (Exception e){
+ throw new CoolException(e.getMessage());
}
}
@@ -454,6 +458,7 @@
throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+dto.getLocNo());
}
} else {
+ log.error(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
throw new CoolException(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
@@ -461,12 +466,20 @@
// 澧炲姞AGV搴撳瓨涓浆鏁伴噺
if (basAgvLocDetls != null){
for (BasAgvLocDetl basAgvLocDetl : basAgvLocDetls) {
- basAgvLocDetlService.insert(basAgvLocDetl);
+ try{
+ basAgvLocDetlService.insert(basAgvLocDetl);
+ } catch (Exception e){
+ log.error("澧炲姞AGV搴撳瓨涓浆鏁伴噺澶辫触");
+ }
}
}
if (basAgvWrkDetls != null){
for (BasAgvWrkDetl basAgvWrkDetl : basAgvWrkDetls) {
- basAgvWrkDetlService.insert(basAgvWrkDetl);
+ try{
+ basAgvWrkDetlService.insert(basAgvWrkDetl);
+ } catch (Exception e){
+ log.error("澧炲姞AGV搴撳瓨涓浆鏁伴噺澶辫触");
+ }
}
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index f14f8e0..eea2467 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -131,7 +131,7 @@
// jsonObject.put("start_biztime", latestUpdateTime);//涓氬姟璧峰鏃ユ湡
jsonObject.put("start_biztime", "2025-01-01 00:00:00");//涓氬姟璧峰鏃ユ湡
jsonObject.put("end_biztime", sdf1.format(now));//涓氬姟缁撴潫鏃ユ湡
- jsonObject.put("billno", null);
+ jsonObject.put("billno", "CGSL-251125-000001");
jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
jsonObject.put("start_auditdate", "2025-11-25 00:00:00");
jsonObject.put("end_auditdate", sdf1.format(now));
@@ -202,12 +202,6 @@
Double width = jsonObjectNew.get("width") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield8").toString()).doubleValue() : 0.0;
Double length = jsonObjectNew.get("length") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield7").toString()).doubleValue() : 0.0;
Double netweight = jsonObjectNew.get("netweight") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield").toString()).doubleValue() : 0.0;
- // ---- 鎺掑簭閫昏緫 ----
- List<Double> dims = Arrays.asList(height, width, length);
- dims.sort(Double::compareTo); // 鍗囧簭鎺掑垪锛氭渶灏忋�佷腑闂淬�佹渶澶�
- Double min = dims.get(0)*10;
- Double mid = dims.get(1)*10;
- Double max = dims.get(2)*10;
// 鐢熸垚鍟嗗搧妗ｆ
Mat mat = matService.selectByMatnr(matnr);
if (mat == null) {
@@ -217,9 +211,9 @@
mat.setTagId(tag.getId());
mat.setWeight(grossweight);//鍑�閲�
mat.setUnits(netweight);//姣涢噸
- mat.setManLength(max);
- mat.setHeight(min);
- mat.setWidth(mid);
+ mat.setManLength(length*10);
+ mat.setHeight(height*10);
+ mat.setWidth(width*10);
mat.setCreateTime(sdf1.parse(createTime));
mat.setUpdateTime(modifyTime);
mat.setStatus(1);
@@ -429,6 +423,8 @@
callApiLogSaveOrder(order, kingDeeUtilType, "鍒涘缓鍏ュ簱鍗曟垚鍔燂紒鍗曞彿锛�" + billNo, true);
}
}
+ String suppCode = jsonObjectNew2.getString("supplier_number"); //渚涘簲鍟�
+
JSONArray billEntryArray = jsonObjectNew2.getJSONArray("billentry");
for (int k = 0; k < billEntryArray.size(); k++) {
JSONObject entry = billEntryArray.getJSONObject(k);
@@ -442,7 +438,6 @@
String s2 = entry.getString("eap7_textfield5"); //鏉＄爜UPC
String memo = entry.getString("eap7_textfield6"); //澶囨敞锛堣嫳鏂囨弿杩帮級
String s1 = entry.getString("eap7_textfield7"); //瀹㈡埛PO
- String suppCode = entry.getString("supplier_number"); //渚涘簲鍟�
if(anfme == 0){
callApiLogSaveOrder(order,kingDeeUtilType, "鍗曟嵁鏁伴噺寮傚父"+matnr, false);
continue;
diff --git a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
index 51e0322..1f2a6f4 100644
--- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
+++ b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
@@ -3,7 +3,7 @@
public enum KingDeeUtilType {
BD_MATERIAL(0, "鐗╂枡妗ｆ","BD_MATERIAL","","","",1),
BD_RRGANIZATION(2, "渚涘簲鍟�","BD_RRGANIZATION","","","",1),
- PUR_RECEIVEBIll(3, "鏀舵枡鍗�","PUR_RECEIVEBIll","","","",1),
+// PUR_RECEIVEBIll(3, "鏀舵枡鍗�","PUR_RECEIVEBIll","","","",1),
// STK_InStock(1, "閲囪喘鍏ュ簱鍗�","STK_InStock","FRealQty","","",1),
// PUR_MRB(2, "閲囪喘閫�鏂欏崟","PUR_MRB","FRMREALQTY","","",1),
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4da0f78..f261cc3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -94,9 +94,9 @@
#璁℃椂鍣ㄤ笂鎶ュ紑鍏�
ErpReportOld: true
#鑾峰彇鍗曟嵁寮�鍏�
- InboundOrderSwitch: true
+ InboundOrderSwitch: false
#鐧诲綍鎺ュ彛寮�鍏�
- LoginAuthenticationSwitch: true
+ LoginAuthenticationSwitch: false
#涓婃姤銆佸鏍稿崟鎹紑鍏�
ReviewOrderSwitch: false
# 鍦板潃
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 591c0ff..528f193 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -128,11 +128,11 @@
{type: 'numbers'},
{field: 'matnr', title: '鍟嗗搧缂栧彿', width: 160},
{field: 'maktx', title: '鍚嶇О', width: 80},
- {field: 'boxType3', title: '閲囪喘鍗曞彿'},
{field: 'standby1', title: '瀹㈡埛PO'},
{field: 'standby2', title: 'UPC'},
{field: 'standby3', title: '瀹㈡埛SKU'},
{field: 'boxType1', title: '璐т富'},
+ {field: 'boxType3', title: '閲囪喘鍗曞彿'},
{field: 'anfme', title: '鏁伴噺', width: 80},
{field: 'qty', title: '涓婃姤鏁伴噺', style: 'font-weight: bold'},
{field: 'workQty', title: '鍘嗗彶涓婃姤鏁伴噺'},
@@ -239,12 +239,12 @@
{field: 'maktx', title: '鍚嶇О', width: 80},
// {field: 'batch', title: '鎵瑰彿', edit: true},
// {field: 'specs', title: '瑙勬牸'},
- {field: 'standby1', title: 'po'},
- {field: 'standby2', title: 'upc'},
- {field: 'standby3', title: '瀹㈡埛SKU'},
- {field: 'boxType1', title: '璐т富鍚嶇О'},
- {field: 'boxType2', title: 'upc'},
- {field: 'boxType3', title: '瀹㈡埛SKU'},
+ {field: 'standby1', title: 'po',edit: true},
+ {field: 'standby2', title: 'upc',edit: true},
+ {field: 'standby3', title: '瀹㈡埛SKU',edit: true},
+ {field: 'boxType1', title: '璐т富鍚嶇О',edit: true},
+ {field: 'boxType2', title: '璐т富缂栧彿',edit: true},
+ {field: 'boxType3', title: '閲囪喘鍗曞彿',edit: true},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 0673161..548b6d5 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -34,8 +34,8 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', width: 160}
,{field: 'maktx', align: 'center',title: '鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�',hide:true}
- ,{field: 'specs', align: 'center',title: '瑙勬牸',hide:true}
+ // ,{field: 'batch', align: 'center',title: '搴忓垪鐮�',hide:true}
+ // ,{field: 'specs', align: 'center',title: '瑙勬牸',hide:true}
,{field: 'standby1', align: 'center',title: 'po', hide: false}
,{field: 'standby2', align: 'center',title: 'upc', hide: false}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
diff --git a/src/main/webapp/static/js/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index 78df7df..519f3c4 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -126,9 +126,12 @@
{type: 'numbers'},
{field: 'matnr', title: '鍟嗗搧缂栧彿', width: 160},
{field: 'maktx', title: '鍚嶇О', width: 160},
+ {field: 'standby3', title: '瀹㈡埛SKU'},
+ {field: 'boxType1', title: '璐т富'},
+ {field: 'boxType3', title: '閲囪喘鍗曞彿'},
// {field: 'batch', title: '鎵瑰彿'}
- {field: 'standby1', align: 'center',title: 'po', hide: false},
- {field: 'standby2', align: 'center',title: 'upc', hide: false},
+ {field: 'standby1', align: 'center',title: '瀹㈡埛PO', hide: false},
+ {field: 'standby2', align: 'center',title: 'UPC', hide: false},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index 998cc41..ec96ddb 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -125,9 +125,12 @@
cols: [[
{type: 'numbers'},
{field: 'matnr', title: '鍟嗗搧缂栧彿', width: 160},
- {field: 'maktx', title: '鍚嶇О', width: 80}
- ,{field: 'standby1', align: 'center',title: 'po', hide: false}
- ,{field: 'standby2', align: 'center',title: 'upc', hide: false},
+ {field: 'maktx', title: '鍚嶇О', width: 80},
+ {field: 'standby3', title: '瀹㈡埛SKU'},
+ {field: 'boxType1', title: '璐т富'},
+ {field: 'boxType3', title: '閲囪喘鍗曞彿'},
+ ,{field: 'standby1', align: 'center',title: '瀹㈡埛PO', hide: false}
+ ,{field: 'standby2', align: 'center',title: 'UPC', hide: false},
// {field: 'batch', title: '鎵瑰彿'},
// {field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index b1ea35c..1461100 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -164,20 +164,20 @@
<!-- lay-verify="required"-->
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">瀹㈡埛PO锛�</label>
- <div class="layui-input-block">
- <input id="standby1" name="standby1" placeholder="杈撳叆瀹㈡埛PO" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
- <!-- lay-verify="required"-->
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">璐т富锛�</label>
- <div class="layui-input-block">
- <input id="owner" name="owner" placeholder="杈撳叆璐т富" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
- <!-- lay-verify="required"-->
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">瀹㈡埛PO锛�</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input id="standby1" name="standby1" placeholder="杈撳叆瀹㈡埛PO" type="text" class="layui-input" maxlength="20" lay-verType="tips" />-->
+<!-- <!– lay-verify="required"–>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">璐т富锛�</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input id="owner" name="owner" placeholder="杈撳叆璐т富" type="text" class="layui-input" maxlength="20" lay-verType="tips" />-->
+<!-- <!– lay-verify="required"–>-->
+<!-- </div>-->
+<!-- </div>-->
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">璐т富锛�</label>-->
<!-- <div class="layui-input-block cool-auto-complete">-->
--
Gitblit v1.9.1