From 7deaef70a6d20a7f1fb86b3af3d58ad76135bc20 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期三, 28 八月 2024 10:27:42 +0800
Subject: [PATCH] 配置
---
src/main/webapp/static/js/order/order.js | 2 +-
src/main/java/com/zy/common/model/DetlDto.java | 2 ++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 3 +++
src/main/webapp/views/order/order.html | 2 +-
4 files changed, 7 insertions(+), 2 deletions(-)
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 a80a11a..05eff1d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -135,6 +135,9 @@
}
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
+ if (!Cools.isEmpty(detlDto.getCFree1())){
+ orderDetl.setSpecs(detlDto.getCFree1());
+ }
orderDetl.setBatch(detlDto.getBatch());
orderDetl.setAnfme(detlDto.getAnfme());
orderDetl.setOrderId(order.getId());
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index b2bae77..033f2da 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -30,6 +30,8 @@
//閿�鍞鍗曡鍙�
private String isoseq;
+ private String cFree1;
+
// 搴撲綅绫诲瀷锛� 1銆佷唬鍖呰鎴愬搧锛�2銆佸師鏉愭枡锛�3銆佺澹�
private Integer locType;
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 159fa28..5d0e67f 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -161,7 +161,7 @@
{field: 'unit', title: '璁￠噺鍗曚綅'},
//{field: 'manu', title: '琛屽彿'},
{field: 'threeCode', title: '閿�鍞崟鍙�'},
- {field: 'deadTime', title: '鑷敱椤�'},
+ {field: 'specs', title: '瑙勬牸'},
//{field: 'itemNum', title: '琛屽敮涓�鏍囪瘑'}
]],
request: {
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index deb7c67..6b7decd 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -301,7 +301,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/order/order.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/order/order.js?v=1" charset="utf-8"></script>
<script type="text/template" id="docTypeTpl">
<option value="">閫夋嫨绫诲瀷</option>
--
Gitblit v1.9.1