From e6a09e06c1d9f6d8bc16e0af0d204deee46ba3df Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 18 七月 2025 12:03:46 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/OrderMapper.xml                     |    4 ++--
 src/main/java/com/zy/asrs/mapper/MatMapper.java               |    2 +-
 src/main/resources/mapper/MatMapper.xml                       |    4 ++++
 src/main/webapp/views/mat/mat.html                            |    6 ++++++
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    1 +
 src/main/java/com/zy/third/erp/task/ERPInOrOutService.java    |    4 ++--
 src/main/java/com/zy/asrs/controller/MatController.java       |    4 +++-
 src/main/java/com/zy/common/web/WcsController.java            |    2 +-
 src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java    |    4 ++--
 src/main/java/com/zy/asrs/service/MatService.java             |    2 +-
 10 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index f974ac2..3c0bc86 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -98,7 +98,9 @@
                 , String.valueOf(tagId)
                 , param.get("matnr")
                 , param.get("maktx")
-                , param.get("specs"))
+                , param.get("specs")
+                , param.get("model"))
+
         );
 
     }
diff --git a/src/main/java/com/zy/asrs/mapper/MatMapper.java b/src/main/java/com/zy/asrs/mapper/MatMapper.java
index 111bec9..b6c0b05 100644
--- a/src/main/java/com/zy/asrs/mapper/MatMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/MatMapper.java
@@ -15,7 +15,7 @@
 public interface MatMapper extends BaseMapper<Mat> {
 
     List<Mat> listByPage(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr,  @Param("maktx") Object maktx);
-    List<Mat> listByPage2(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr,  @Param("maktx") Object maktx,  @Param("specs") Object specs);
+    List<Mat> listByPage2(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr,  @Param("maktx") Object maktx,  @Param("specs") Object specs,@Param("model") Object model);
 
     Mat selectByMatnr(@Param("matnr")String matnr);
 
diff --git a/src/main/java/com/zy/asrs/service/MatService.java b/src/main/java/com/zy/asrs/service/MatService.java
index 498171e..54e314d 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -9,7 +9,7 @@
 public interface MatService extends IService<Mat> {
 
     Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx);
-    Page<Mat> getPage2(Page page, String tagId, Object matnr, Object maktx, Object specs);
+    Page<Mat> getPage2(Page page, String tagId, Object matnr, Object maktx, Object specs,Object model);
 
     Mat selectByMatnr(String matnr);
     List<Mat> selectByMatnrLink(String matnr);
diff --git a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
index cd7f91b..90713ca 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -17,8 +17,8 @@
         return page.setRecords(baseMapper.listByPage(page, tagId, matnr, maktx));
     }
     @Override
-    public Page<Mat> getPage2(Page page, String tagId, Object matnr, Object maktx, Object specs) {
-        return page.setRecords(baseMapper.listByPage2(page, tagId, matnr, maktx, specs));
+    public Page<Mat> getPage2(Page page, String tagId, Object matnr, Object maktx, Object specs,Object model) {
+        return page.setRecords(baseMapper.listByPage2(page, tagId, matnr, maktx, specs,model));
     }
 
 
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 febbe53..a3c18d9 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -189,6 +189,7 @@
                     waitPakin.setProType(orderDetl.getProType());
                     waitPakin.setLuHao(orderDetl.getLuHao());
                     waitPakin.setPacking(orderDetl.getPacking());
+                    waitPakin.setTemp2(orderDetl.getTemp2());
                     if (!waitPakinService.insert(waitPakin)) {
                         throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
                     }
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index a191ac2..807c67e 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -381,7 +381,7 @@
                     wrkDetl.setProType(orderDetl.getProType());
                     wrkDetl.setSPgNO(orderDetl.getSPgNO());
                     wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
-//                    wrkDetl.setLuHao(orderDetl.getLuHao());
+                    wrkDetl.setLuHao(orderDetl.getLuHao());
                     wrkDetl.setSupp(orderDetl.getSupp());
                     wrkDetl.setSuppCode(orderDetl.getSuppCode());
                     wrkDetl.setPacking(orderDetl.getPacking());
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 a7c0421..d25df2f 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
@@ -119,7 +119,7 @@
             orderDetl.setOutOrderNo(outDetTB.getOrderNo());
             orderDetl.setAutoId(outDetTB.getAutoId());
             orderDetl.setDetId(outDetTB.getDetId());
-//            orderDetl.setLuHao(outDetTB.getLuHao());
+            orderDetl.setLuHao(outDetTB.getFactArea());
 //            orderDetl.setSpecs(outDetTB.getSPgNO());
             orderDetl.setPacking(outDetTB.getPacking());
             orderDetl.setSuppCode(inHedTB.getObjectId());
@@ -225,7 +225,7 @@
             orderDetl.setAutoId(outDetTB.getAutoId());
             orderDetl.setSpecs(mat.getSpecs());
             orderDetl.setDetId(outDetTB.getDetId());
-//            orderDetl.setLuHao(outDetTB.getLuHao());
+            orderDetl.setLuHao(outDetTB.getFactArea());
             orderDetl.setSpecs(outDetTB.getSPgNO());
             orderDetl.setSuppCode(inHedTB.getObjectId());
             orderDetl.setSupp(inHedTB.getObjectName());
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 6cc8de5..3f4b0a4 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -96,6 +96,10 @@
         <if test="specs != null and specs != ''">
             and mm.specs like concat('%',#{specs},'%')
         </if>
+        <if test="model != null and model != ''">
+            and mm.model like concat('%',#{model},'%')
+        </if>
+
         ORDER BY mm.create_time DESC
     </select>
 
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index b8f4354..3aebce7 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -114,10 +114,10 @@
         FROM man_order
         WHERE 1=1
         <if test="orderNo != null and orderNo != ''">
-            AND order_no COLLATE Chinese_PRC_CI_AS LIKE CONCAT('%', #{orderNo}, '%')
+            AND order_no LIKE '%' + #{orderNo} + '%'
         </if>
         AND doc_type IN (34, 36, 37, 39, 40)
-        AND status IN (1, 2)
+        AND settle IN (1, 2)
         ORDER BY create_time DESC
     </select>
 
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 8292942..061fbb1 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -98,6 +98,12 @@
                             </div>
                         </div>
                         <div class="layui-inline">
+                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧浠g爜:</label>
+                            <div class="layui-input-inline">
+                                <input name="model" class="layui-input" placeholder="杈撳叆鍟嗗搧浠g爜"/>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
                             <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧瑙勬牸:</label>
                             <div class="layui-input-inline">
                                 <input name="specs" class="layui-input" placeholder="杈撳叆鍟嗗搧瑙勬牸"/>

--
Gitblit v1.9.1