From 3954c28bb43412328694afd56bbf3946be60749a Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 19 六月 2025 13:35:14 +0800
Subject: [PATCH] #订单导入等界面功能修改
---
src/main/resources/mapper/OrderDetlMapper.xml | 6 ++++--
src/main/webapp/static/js/order/out.js | 17 +++++++++++++----
src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java | 8 +++++---
src/main/java/com/zy/asrs/importexcle/ImportOrderDto.java | 7 ++++++-
src/main/webapp/static/js/order/order.js | 4 ++--
src/main/java/com/zy/common/model/LocDto.java | 4 ++++
src/main/java/com/zy/asrs/controller/OutController.java | 5 +++--
7 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 2e57917..3cd93bf 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -100,8 +100,9 @@
locDto.setLocNo(locDetls.get(0).getLocNo());
// wrkDetl.setMatnr(roll.getSpecs()); // 瑙勬牸
// wrkDetl.setMaktx(roll.getSpecs()); //瑙勬牸
-// locDto.setBatch(locDetl.getBatch()); // 绠卞彿
-// locDto.setModel(locDetl.getModel()); // 鍗峰彿
+ locDto.setUnit(locDetls.get(0).getUnit()); // 绠卞彿
+ locDto.setModel(locDetls.get(0).getModel()); // 鍗峰彿
+ locDto.setThreeCode(locDetls.get(0).getThreeCode());
locDto.setBrand(orderDetl.getBrand()); // 鍖呰缁勫彿
// locDto.setOrigin(locDetl.getOrigin()); // 鏈ㄧ鍦ㄦ墭鐩樹綅缃�
// locDto.setWeight(locDetl.getWeight()); // 鍑�閲�
diff --git a/src/main/java/com/zy/asrs/importexcle/ImportOrderDto.java b/src/main/java/com/zy/asrs/importexcle/ImportOrderDto.java
index eb46ed0..0356161 100644
--- a/src/main/java/com/zy/asrs/importexcle/ImportOrderDto.java
+++ b/src/main/java/com/zy/asrs/importexcle/ImportOrderDto.java
@@ -17,7 +17,12 @@
@ExcelProperty(value = "鍑哄簱鍗曞彿/鍗曟嵁绫诲瀷/瀹㈡埛鍚嶇О/澶囨敞/鐩爣搴撲綅",index = 1)
private String column2;
- @ExcelProperty(value = "鐩爣宸烽亾",index = 2)
+ @ExcelProperty(value = "鐩爣宸烽亾/瀹㈡埛鍚嶇О",index = 2)
private String column3;
+ @ExcelProperty(value = "澶囨敞",index = 3)
+ private String column4;
+
+
+
}
diff --git a/src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java b/src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java
index e862d93..6414451 100644
--- a/src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java
+++ b/src/main/java/com/zy/asrs/importexcle/ImportOrderListener.java
@@ -69,7 +69,7 @@
public void invoke(ImportOrderDto data, AnalysisContext context) {
log.info("瑙ｆ瀽鍒扮 {} 鏉℃暟鎹�:{}", ++count, JSON.toJSONString(data));
list.add(data);
- if (context.getCurrentRowNum() == 5) {
+ if (context.getCurrentRowNum() == 3) {
String time = DateUtils.convert(new Date(),DateUtils.yyyyMMddHHmmss_F);
Order order2 = orderService.selectByNo(list.get(0).getColumn2()); // 璁㈠崟鍙�
if(order2 != null) {
@@ -86,8 +86,8 @@
order.setOrderNo(orderNo);
order.setOrderTime(time);
order.setDocType(docType.getDocId());
- order.setCstmrName(Cools.isEmpty(list.get(2).getColumn2()) ? "" : list.get(2).getColumn2()); // 瀹㈡埛鍚嶇О
- order.setMemo(Cools.isEmpty(list.get(3).getColumn2()) ? "" : list.get(3).getColumn2()); // 澶囨敞
+// order.setCstmrName(Cools.isEmpty(list.get(2).getColumn2()) ? "" : list.get(2).getColumn2()); // 瀹㈡埛鍚嶇О
+// order.setMemo(Cools.isEmpty(list.get(3).getColumn2()) ? "" : list.get(3).getColumn2()); // 澶囨敞
order.setSettle(1L);
order.setStatus(1);
order.setCreateBy(userId);
@@ -178,6 +178,8 @@
}
} else {
orderDetl.setBrand(importOrderDto.getColumn1());
+ orderDetl.setSupp(importOrderDto.getColumn3());
+ orderDetl.setMemo(importOrderDto.getColumn4());
}
orderDetl.setBatch("");
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index de1a694..4dd1a6f 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -47,6 +47,8 @@
private Integer staNo;
private Integer tkType;
+ private String unit;
+ private String threeCode;
public LocDto() {
}
@@ -109,6 +111,8 @@
this.volume = locDetl.getVolume();
this.price = locDetl.getPrice();
this.origin = locDetl.getOrigin();
+ this.unit = locDetl.getUnit();
+ this.threeCode = locDetl.getThreeCode();
}
public String getTitle() {
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 3097092..424275d 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -186,7 +186,7 @@
</insert>
<insert id="batchDetls">
INSERT INTO
- man_order_detl(brand,batch,order_id,order_no,specs,model,be_batch,create_by,create_time,status,qty,anfme)
+ man_order_detl(brand,batch,order_id,order_no,specs,model,be_batch,create_by,create_time,status,qty,anfme,supp,memo)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(
@@ -201,7 +201,9 @@
#{item.createTime},
#{item.status},
#{item.qty},
- #{item.anfme}
+ #{item.anfme},
+ #{item.supp},
+ #{item.memo}
)</foreach>
</insert>
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 39429d6..320f168 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -248,8 +248,8 @@
{type: 'numbers'},
{field: 'brand', title: '鍖呰缁勫彿', width: 160},
// {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- // {field: 'batch', title: '绠卞彿'},
- // {field: 'anfme', title: '鏁伴噺'},
+ {field: 'supp', title: '瀹㈡埛鍚嶇О'},
+ {field: 'memo', title: '澶囨敞'},
// {field: 'workQty', title: '浣滀笟鏁伴噺'},
// {field: 'unit', title: '鍗曚綅'},
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 099e978..ecb0789 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -38,11 +38,11 @@
// ,{field: 'specs', align: 'center',title: '鎺ュご'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'brand', align: 'center',title: '鍖呰缁勫彿'}
+ ,{field: 'supp', align: 'center',title: '瀹㈡埛鍚嶇О', hide: false}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
- ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
- ,{field: 'threeCode', align: 'center',title: '鍚堟牸鍚�', hide: false}
// ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
// ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜', hide: true}
// ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
@@ -161,8 +161,17 @@
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
// {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- // {field: 'batch', title: '绠卞彿', align: 'center'},
- // {field: 'model', title: '鍗峰彿', align: 'center', hide: false},
+ {field: 'unit', title: '绠卞彿', align: 'center',hide:false},
+ {field: 'model', title: '鍗峰彿', align: 'center', hide: false},
+ {
+ field: 'threeCode',
+ align: 'center',
+ title: '鍚堟牸鍚�',
+ hide: false,
+ templet: function(d) {
+ return d.threeCode ? d.threeCode : '寰呭垽';
+ }
+ },
// {field: 'specs', title: '鎺ュご', align: 'center'},
{field: 'brand', align: 'center',title: '鍖呰缁勫彿', merge: true, hide: false},
// {field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false},
--
Gitblit v1.9.1