From 7dc778306c067c1805a75ed1b4b3c8c6d39ff95f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 27 二月 2026 10:56:38 +0800
Subject: [PATCH] u8同步订单备注，聚乳酸出库时回显
---
src/main/java/com/zy/asrs/controller/OrderController.java | 1 +
src/main/webapp/static/js/order/order.js | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2 +-
src/main/webapp/static/js/cool.js | 2 ++
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index c73d459..aa74668 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -397,6 +397,7 @@
map.put("addr", order.getNumber());
map.put("allocate", order.getItemName());
map.put("type", "order");
+ map.put("memo",order.getMemo());
result.add(map);
}
return R.ok(result);
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 33598d8..fa29683 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -263,7 +263,7 @@
now, // 娣诲姞鏃堕棿
9527L, // 淇敼浜哄憳
now, // 淇敼鏃堕棿
- null // 澶囨敞
+ param.getCMemo() // 澶囨敞
);
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
diff --git a/src/main/webapp/static/js/cool.js b/src/main/webapp/static/js/cool.js
index 41fcca4..2066701 100644
--- a/src/main/webapp/static/js/cool.js
+++ b/src/main/webapp/static/js/cool.js
@@ -67,6 +67,7 @@
option.allocate = list[i].allocate;
option.weight = list[i].weight;
option.type = list[i].type;
+ option.memo = list[i].memo;
selectDom.options[i+1] = option;
}
selectDom.style.display='block';
@@ -111,6 +112,7 @@
}
if(selectOptionDom[0].type === "order" || selectOptionDom[0].type === "locOwner"){
$('#allocate').val(selectOptionDom[0].allocate ? selectOptionDom[0].allocate : "");
+ $('#memo').val(selectOptionDom[0].memo ? selectOptionDom[0].memo : "");
$('#customer').val(selectOptionDom[0].customer ? selectOptionDom[0].customer : "");
$('#phone').val(selectOptionDom[0].phone ? selectOptionDom[0].phone : "");
$('#addr').val(selectOptionDom[0].addr ? selectOptionDom[0].addr : "");
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 3b085f1..f6c84b8 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -53,7 +53,7 @@
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'cstmrName', align: 'center',title: '瀹㈡埛鍚嶇О'},
{field: 'itemName', align: 'center',title: '璋冩嫧鍒�'},
- {field: 'memo', align: 'center',title: '澶囨敞', hide: true},
+ {field: 'memo', align: 'center',title: '澶囨敞'},
{field: 'createBy$', align: 'center', title: '鎿嶄綔鍛�', minWidth: 160, width: 160},
{align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 260}
]],
--
Gitblit v1.9.1