From 304d785396e666534ec15a3ad1ad8e41da6ffad2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 04 六月 2025 15:44:24 +0800
Subject: [PATCH] 关闭与erp的对接
---
src/main/webapp/static/js/locDetl/locDetl.js | 5 +++--
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 3 +++
src/main/webapp/static/js/orderPakout/order.js | 1 +
src/main/webapp/static/js/order/order.js | 1 +
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 2 ++
src/main/java/com/zy/common/model/DetlDto.java | 1 +
src/main/java/com/zy/nc/task/handler/BaseDataHandler.java | 2 ++
src/main/webapp/static/js/common.js | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 4 +++-
9 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
index f12ed03..a98bb6b 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -33,6 +33,9 @@
private String lgort;
+ private String cstmrName;
+
+
// public static void main(String[] args) {
// OpenOrderPakoutParam param = new OpenOrderPakoutParam();
// param.setOrderNo("LXT12321321");
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index f48ee21..8f53e9d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -250,7 +250,7 @@
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
+ param.getCstmrName(), // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
null, // 鎿嶄綔浜哄憳
null, // 鍚堣閲戦
@@ -286,6 +286,7 @@
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getLineNumber(),
detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
dto.setRemark(detail.getRemark());
+ dto.setWeight(detail.getWeight());
if (DetlDto.hasLineNumber(list, dto)) {
DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getLineNumber(),
dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
@@ -305,6 +306,7 @@
orderDetl.setLineNumber(detlDto.getLineNumber());
orderDetl.setBatch(detlDto.getBatch());
orderDetl.setAnfme(detlDto.getAnfme());
+ orderDetl.setWeight(detlDto.getWeight());
orderDetl.setBrand(detlDto.getBrand());
orderDetl.setStandby1(detlDto.getStandby1());
orderDetl.setStandby2(detlDto.getStandby2());
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 6cc02fa..1d97141 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -36,6 +36,7 @@
private Double anfme;
+ private Double weight;
diff --git a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
index b145b31..2ac629b 100644
--- a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
@@ -287,6 +287,8 @@
matParam.setModel(vGetBdMaterial.get鍨嬪彿());
matParam.setUnit(vGetBdMaterial.get涓诲崟浣�());
matParam.setMemo(vGetBdMaterial.get澶囨敞());
+ matParam.setName(vGetBdMaterial.get鐗╂枡绠�绉皍8鏃у搧鍚�());
+ matParam.setOrigin(vGetBdMaterial.get涓昏緟鎹㈢畻姣�());
matParam.setGroupCode(vGetBdMaterial.get瀛樿揣鍒嗙被缂栫爜());
matParam.setGroupName(vGetBdMaterial.get瀛樿揣鍒嗙被鍚嶇О());
matDetails.add(matParam);
diff --git a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
index 8712fc1..9fbf7c8 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -91,6 +91,7 @@
detlDto = new DetlDto();
detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
detlDto.setAnfme(nccSaleXsfhmxWms.getNnum().doubleValue());
+ detlDto.setWeight(nccSaleXsfhmxWms.getNastnum().doubleValue());
detlDto.setStandby1(nccSaleXsfhmxWms.getFhckbm());
detlDto.setLineNumber(i);
detlDto.setRemark(JSONObject.toJSONString(nccSaleXsfhmxWms));
@@ -99,6 +100,7 @@
i++;
nccSaleXsfhmxWms.setWmsFlag(1);
param.setOrderNo(nccSaleXsfhmxWms.getVbillcode() + "-" + size);
+ param.setCstmrName(nccSaleXsfhmxWms.getKhmc());
}
param.setOrderDetails(orderDetails);
openService.pakoutOrderCreate(param);
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index fe7f71e..b0b18db 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -244,7 +244,7 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
+ ,{field: 'weight', align: 'center',title: '杈呮暟閲�'}
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', 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 14c17ee..7d2aefa 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -11,7 +11,8 @@
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
+ ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+ ,{field: 'standby1$', align: 'center',title: '浠撳簱'}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
@@ -24,7 +25,7 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
+ ,{field: 'weight', align: 'center',title: '杈呮暟閲�'}
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index f2b8448..e229124 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -44,6 +44,7 @@
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
+ {field: 'cstmrName', align: 'center', title: '瀹㈡埛'},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index 15b289a..e079284 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -44,6 +44,7 @@
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
+ {field: 'cstmrName', align: 'center', title: '瀹㈡埛'},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
--
Gitblit v1.9.1