From 9435d89f868c0971fa9f8eab6480fbc1b0c73db5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 20 五月 2025 18:33:01 +0800
Subject: [PATCH] #pda订单组托
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 2 +
src/main/java/com/zy/asrs/entity/OrderDetl.java | 7 +++
src/main/java/com/zy/third/erp/task/ERPItemService.java | 3 +
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 6 +-
src/main/webapp/static/js/saas/locDetl.js | 8 ++--
src/main/java/com/zy/asrs/controller/MobileController.java | 3 +
src/main/java/com/zy/common/web/WcsController.java | 2
src/main/resources/mapper/OrderDetlMapper.xml | 1
src/main/webapp/static/js/locDetl/locDetl.js | 8 ++--
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 2
src/main/webapp/static/js/order/order.js | 6 +++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2
src/main/java/com/zy/third/erp/task/ERPInOrOutService.java | 8 +++-
src/main/webapp/static/js/common.js | 10 ++--
14 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index c540ab9..1081145 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -138,10 +138,13 @@
combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
combMat.setMaktx(orderDetl.getMaktx());
combMat.setSpecs(orderDetl.getSpecs());
+ combMat.setDetId(orderDetl.getDetId());
+ combMat.setDetlId(orderDetl.getId());
combMats.add(combMat);
}
combParam.setCombMats(combMats);
}
+ combParam.setBillNo(order.getOrderNo());
combParam.setOrderNo(order.getOrderNo());
combParams.add(combParam);
}
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 4616743..63f74ca 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -338,10 +338,14 @@
@TableField("pro_type")
private String proType;
+ @TableField("det_id")
+ private Integer detId;
+
+
public OrderDetl() {
}
- public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo,Integer detId) {
this.orderId = orderId;
this.orderNo = orderNo;
this.anfme = anfme;
@@ -381,6 +385,7 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.detId = detId;
}
public String getOrderId$() {
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 97ab3b5..c1fea83 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -30,6 +30,8 @@
private Long detlId;
+ private Integer detId;
+
// 鐗╂枡缂栧彿
private String matnr;
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index 65bc589..d633737 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -35,7 +35,7 @@
private String outOrderNo;
-// private String luHao;
+ private String luHao;
private Double weight;
private String packing;
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 1d0102f..20eb4de 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -144,7 +144,7 @@
// 鍏宠仈缁勬墭
} else {
- Order order = orderService.selectOne(new EntityWrapper<Order>().eq("temp1", param.getOrderNo()));
+ Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", param.getOrderNo()));
if (Cools.isEmpty(order) || order.getSettle() > 2) {
throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 473c209..f0d4b32 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -373,7 +373,7 @@
wrkDetl.setSPgNO(orderDetl.getSPgNO());
wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
// wrkDetl.setLuHao(orderDetl.getLuHao());
- wrkDetl.setWeight(wrkMast.getScWeight());
+ wrkDetl.setWeight(weight);
wrkDetl.setPacking(orderDetl.getPacking());
wrkDetl.setColor(orderDetl.getColor());
wrkDetl.setWareId(orderDetl.getWareId());
diff --git a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
index 95deee3..dfda9fb 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
@@ -118,8 +118,9 @@
orderDetl.setOrderNo(outDetTB.getBillNo());
orderDetl.setOutOrderNo(outDetTB.getOrderNo());
orderDetl.setAutoId(outDetTB.getAutoId());
+ orderDetl.setDetId(outDetTB.getDetId());
// orderDetl.setLuHao(outDetTB.getLuHao());
- orderDetl.setSpecs(outDetTB.getSPgNO());
+// orderDetl.setSpecs(outDetTB.getSPgNO());
orderDetl.setPacking(outDetTB.getPacking());
orderDetl.setWareId(outDetTB.getWareId());
orderDetl.setWareName(outDetTB.getWareName());
@@ -220,6 +221,8 @@
orderDetl.setOrderNo(outDetTB.getBillNo());
orderDetl.setOutOrderNo(outDetTB.getOrderNo());
orderDetl.setAutoId(outDetTB.getAutoId());
+ orderDetl.setSpecs(mat.getSpecs());
+ orderDetl.setDetId(outDetTB.getDetId());
// orderDetl.setLuHao(outDetTB.getLuHao());
orderDetl.setSpecs(outDetTB.getSPgNO());
orderDetl.setPacking(outDetTB.getPacking());
@@ -233,7 +236,8 @@
orderDetl.setTemp2(outDetTB.getTemp2());
orderDetl.setTemp3(outDetTB.getTemp3());
orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setThreeCode(outDetTB.getDetId() + "");
+ orderDetl.setThreeCode(outDetTB.getTemp1());
+ orderDetl.setModel(outDetTB.getItemCode());
orderDetl.setCreateBy(9527L);
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(9527L);
diff --git a/src/main/java/com/zy/third/erp/task/ERPItemService.java b/src/main/java/com/zy/third/erp/task/ERPItemService.java
index 8a81a98..81e794a 100644
--- a/src/main/java/com/zy/third/erp/task/ERPItemService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPItemService.java
@@ -102,11 +102,12 @@
}
private Mat sync(Mat mat, ItemTB itemTB) {
- mat.setModel(itemTB.getItemCode());
+ mat.setThreeCode(itemTB.getItemCode());
mat.setMatnr(itemTB.getItemId());
mat.setMaktx(itemTB.getItemName());
mat.setSpecs(itemTB.getItemSpc());
mat.setUnit(itemTB.getItemUnit());
+ mat.setSku(itemTB.getItemPic());
mat.setMemo(itemTB.getRemark());
mat.setCreateTime(itemTB.getMakeDate());
mat.setTemp1(itemTB.getTemp1());
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index c1224ca..f7ae4f7 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -58,6 +58,7 @@
<result column="ware_id" property="wareId" />
<result column="ware_mame" property="wareName" />
<result column="packing" property="packing" />
+ <result column="det_id" property="detId"/>
</resultMap>
<select id="selectItem" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 35a6602..5580e0d 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -191,9 +191,9 @@
,{field: 'model', align: 'center',title: '浠ｇ爜'}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+ ,{field: 'sku', align: 'center',title: '鏉愯川'}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
@@ -226,8 +226,8 @@
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', sort:true}
- ,{field: 'batch', align: 'center',title: '鎵规', sort:true}
+ ,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', hide:true,sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵规', hide:true,sort:true}
,{field: 'outOrderNo', align: 'center',title: '璁㈠崟鍙�', sort:true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
@@ -236,7 +236,7 @@
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+ ,{field: 'sku', align: 'center',title: '鏉愯川', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', 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 cdb1c74..2b5c7b4 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -6,18 +6,18 @@
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'model', align: 'center',title: '浠ｇ爜'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
- ,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', sort:true}
+ ,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', hide:true,sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 200, sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 200,hide:true, sort:true}
,{field: 'outOrderNo', align: 'center',title: '璁㈠崟鍙�'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+ ,{field: 'sku', align: 'center',title: '鏉愯川', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', 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 6291317..9325b1c 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -8,13 +8,13 @@
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
//,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '浠ｇ爜'}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+ ,{field: 'sku', align: 'center',title: '鏉愯川'}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', 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 f379902..46246c8 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -126,6 +126,8 @@
{field: 'model', title: '鐗╂枡浠ｇ爜', width: 150},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 150},
{field: 'batch', title: '鎵瑰彿'},
+ {field: 'proType', title: '灞炴��'},
+ {field: 'temp1', title: '鍚堝悓鍙�'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
@@ -238,10 +240,14 @@
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
{field: 'batch', title: '鎵瑰彿', edit: true},
+ {field: 'proType', title: '灞炴��', edit: true},
+ {field: 'model', title: '浠ｇ爜', edit: true},
+ {field: 'threeCode', title: '鍚堝悓鍙�', edit: true},
{field: 'specs', title: '瑙勬牸'},
{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},
+ {field: 'wareName', title: '浠撳簱', edit: true},
{field: 'memo', title: '澶囨敞' , edit: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
]],
diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js
index 923c1c7..8aa2e01 100644
--- a/src/main/webapp/static/js/saas/locDetl.js
+++ b/src/main/webapp/static/js/saas/locDetl.js
@@ -4,17 +4,17 @@
{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, hide: true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false, hide: false}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true , hide: true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: true}
- ,{field: 'specs', align: 'center',title: '閰嶇疆' , hide: true}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸' , hide: true}
,{field: 'model', align: 'center',title: '浠ｇ爜'}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+ ,{field: 'sku', align: 'center',title: '鏉愯川', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
--
Gitblit v1.9.1