From eddd13490f2d17c70841d468cf5cac3779f9886b Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 24 四月 2024 15:02:42 +0800
Subject: [PATCH] 添加图号

---
 src/main/webapp/static/js/locDetl/locDetl.js                |    2 +-
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 4467f47..a3616dc 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -331,6 +331,7 @@
             if (orderDetl == null) {
                 orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
             }
+            Mat mat=matService.selectOne(new EntityWrapper<Mat>().eq("matnr",locDto.getMatnr()));
             WrkDetl wrkDetl = new WrkDetl();
             wrkDetl.sync(orderDetl);
             wrkDetl.setZpallet(wrkMast.getBarcode());
@@ -338,6 +339,7 @@
             wrkDetl.setWrkNo(workNo);
             wrkDetl.setBatch(locDto.getBatch());
             wrkDetl.setOrderNo(locDto.getOrderNo());
+            wrkDetl.setModel(mat.getModel());
             wrkDetl.setAnfme(locDto.getAnfme()); // 鏁伴噺
             wrkDetl.setAppeTime(now);
             wrkDetl.setAppeUser(userId);
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 2466f8e..c8c4d63 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -9,7 +9,7 @@
         ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
         ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
         ,{field: 'specs', align: 'center',title: '閰嶇疆'}
-        ,{field: 'model', align: 'center',title: '浠g爜', hide: true}
+        ,{field: 'model', align: 'center',title: '鍥惧彿', hide: false}
         ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
         ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
         ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}

--
Gitblit v1.9.1