From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了,单据状态还是作业中,现在作业中的单据是可以删除的,我不小心把这个单据删除了,怎么恢复? 36.每个界面点下一页都没反应,点第二页是有变化的,之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息(客户名称、收件人、地址、电话等),现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/MatFieldMapper.java |  230 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/MatFieldMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/MatFieldMapper.java
index a4a3d44..7fe3f28 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/MatFieldMapper.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/MatFieldMapper.java
@@ -1,115 +1,115 @@
-package com.zy.asrs.wms.asrs.mapper;
-
-import com.zy.asrs.wms.asrs.entity.MatField;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.SelectProvider;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-@Repository
-public interface MatFieldMapper extends BaseMapper<MatField> {
-
-    @SelectProvider(type = SqlProvider.class, method = "createViewSql")
-    void createView(@Param("list") List<MatField> list);
-
-    @SelectProvider(type = SqlProvider.class, method = "createLocDetlView")
-    void createLocDetlView();
-
-    @SelectProvider(type = SqlProvider.class, method = "createTaskDetlFieldSql")
-    void createTaskDetlFieldView(@Param("list") List<MatField> list);
-
-    @SelectProvider(type = SqlProvider.class, method = "createViewTaskDetlSql")
-    void createViewTaskDetlView();
-
-    @SelectProvider(type = SqlProvider.class, method = "createOrderDetlFieldSql")
-    void createOrderDetlFieldView(@Param("list") List<MatField> list);
-
-    @SelectProvider(type = SqlProvider.class, method = "createViewOrderDetlSql")
-    void createViewOrderDetlView();
-
-    class SqlProvider {
-        public String createViewSql(Map<String, Object> params) {
-            List<MatField> list = (List<MatField>) params.get("list");
-            StringBuilder sql = new StringBuilder();
-
-            sql.append(" CREATE OR REPLACE VIEW view_man_loc_detl_field AS \n");
-            sql.append(" SELECT detl_id ");
-            for (MatField matField : list) {
-                sql.append(", MAX(CASE WHEN name = '").append(matField.getName()).append("' THEN value END) AS ").append(matField.getName());
-            }
-            sql.append(" FROM man_loc_detl_field ");
-            sql.append(" GROUP BY detl_id ");
-
-            return sql.toString();
-        }
-
-        public String createLocDetlView() {
-            StringBuilder sql = new StringBuilder();
-
-            sql.append(" CREATE OR REPLACE VIEW view_man_loc_detl AS \n");
-            sql.append(" select * from man_loc_detl ld ");
-            sql.append(" left join view_man_loc_detl_field ldf ");
-            sql.append(" on ld.id = ldf.detl_id ");
-
-            return sql.toString();
-        }
-
-        public String createTaskDetlFieldSql(Map<String, Object> params) {
-            List<MatField> list = (List<MatField>) params.get("list");
-            StringBuilder sql = new StringBuilder();
-
-            sql.append(" CREATE OR REPLACE VIEW view_man_task_detl_field AS \n");
-            sql.append(" SELECT detl_id as _detl_id ");
-            for (MatField matField : list) {
-                sql.append(", MAX(CASE WHEN name = '").append(matField.getName()).append("' THEN value END) AS ").append(matField.getName());
-            }
-            sql.append(" FROM man_task_detl_field ");
-            sql.append(" GROUP BY _detl_id ");
-
-            return sql.toString();
-        }
-
-        public String createViewTaskDetlSql() {
-            StringBuilder sql = new StringBuilder();
-
-            sql.append(" CREATE OR REPLACE VIEW view_man_task_detl AS \n");
-            sql.append(" select * from man_task_detl td ");
-            sql.append(" left join view_man_task_detl_field tdf ");
-            sql.append(" on td.id = tdf._detl_id ");
-
-            return sql.toString();
-        }
-
-        public String createOrderDetlFieldSql(Map<String, Object> params) {
-            List<MatField> list = (List<MatField>) params.get("list");
-            StringBuilder sql = new StringBuilder();
-
-            sql.append(" CREATE OR REPLACE VIEW view_man_order_detl_field AS \n");
-            sql.append(" SELECT detl_id as _detl_id ");
-            for (MatField matField : list) {
-                sql.append(", MAX(CASE WHEN name = '").append(matField.getName()).append("' THEN value END) AS ").append(matField.getName());
-            }
-            sql.append(" FROM man_order_detl_field ");
-            sql.append(" GROUP BY _detl_id ");
-
-            return sql.toString();
-        }
-
-        public String createViewOrderDetlSql() {
-            StringBuilder sql = new StringBuilder();
-
-            sql.append(" CREATE OR REPLACE VIEW view_man_order_detl AS \n");
-            sql.append(" select * from man_order_detl od ");
-            sql.append(" left join view_man_order_detl_field odf ");
-            sql.append(" on od.id = odf._detl_id ");
-
-            return sql.toString();
-        }
-    }
-
-}
+package com.zy.asrs.wms.asrs.mapper;
+
+import com.zy.asrs.wms.asrs.entity.MatField;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+@Repository
+public interface MatFieldMapper extends BaseMapper<MatField> {
+
+    @SelectProvider(type = SqlProvider.class, method = "createViewSql")
+    void createView(@Param("list") List<MatField> list);
+
+    @SelectProvider(type = SqlProvider.class, method = "createLocDetlView")
+    void createLocDetlView();
+
+    @SelectProvider(type = SqlProvider.class, method = "createTaskDetlFieldSql")
+    void createTaskDetlFieldView(@Param("list") List<MatField> list);
+
+    @SelectProvider(type = SqlProvider.class, method = "createViewTaskDetlSql")
+    void createViewTaskDetlView();
+
+    @SelectProvider(type = SqlProvider.class, method = "createOrderDetlFieldSql")
+    void createOrderDetlFieldView(@Param("list") List<MatField> list);
+
+    @SelectProvider(type = SqlProvider.class, method = "createViewOrderDetlSql")
+    void createViewOrderDetlView();
+
+    class SqlProvider {
+        public String createViewSql(Map<String, Object> params) {
+            List<MatField> list = (List<MatField>) params.get("list");
+            StringBuilder sql = new StringBuilder();
+
+            sql.append(" CREATE OR REPLACE VIEW view_man_loc_detl_field AS \n");
+            sql.append(" SELECT detl_id ");
+            for (MatField matField : list) {
+                sql.append(", MAX(CASE WHEN name = '").append(matField.getName()).append("' THEN value END) AS ").append(matField.getName());
+            }
+            sql.append(" FROM man_loc_detl_field ");
+            sql.append(" GROUP BY detl_id ");
+
+            return sql.toString();
+        }
+
+        public String createLocDetlView() {
+            StringBuilder sql = new StringBuilder();
+
+            sql.append(" CREATE OR REPLACE VIEW view_man_loc_detl AS \n");
+            sql.append(" select * from man_loc_detl ld ");
+            sql.append(" left join view_man_loc_detl_field ldf ");
+            sql.append(" on ld.id = ldf.detl_id ");
+
+            return sql.toString();
+        }
+
+        public String createTaskDetlFieldSql(Map<String, Object> params) {
+            List<MatField> list = (List<MatField>) params.get("list");
+            StringBuilder sql = new StringBuilder();
+
+            sql.append(" CREATE OR REPLACE VIEW view_man_task_detl_field AS \n");
+            sql.append(" SELECT detl_id as _detl_id ");
+            for (MatField matField : list) {
+                sql.append(", MAX(CASE WHEN name = '").append(matField.getName()).append("' THEN value END) AS ").append(matField.getName());
+            }
+            sql.append(" FROM man_task_detl_field ");
+            sql.append(" GROUP BY _detl_id ");
+
+            return sql.toString();
+        }
+
+        public String createViewTaskDetlSql() {
+            StringBuilder sql = new StringBuilder();
+
+            sql.append(" CREATE OR REPLACE VIEW view_man_task_detl AS \n");
+            sql.append(" select * from man_task_detl td ");
+            sql.append(" left join view_man_task_detl_field tdf ");
+            sql.append(" on td.id = tdf._detl_id ");
+
+            return sql.toString();
+        }
+
+        public String createOrderDetlFieldSql(Map<String, Object> params) {
+            List<MatField> list = (List<MatField>) params.get("list");
+            StringBuilder sql = new StringBuilder();
+
+            sql.append(" CREATE OR REPLACE VIEW view_man_order_detl_field AS \n");
+            sql.append(" SELECT detl_id as _detl_id ");
+            for (MatField matField : list) {
+                sql.append(", MAX(CASE WHEN name = '").append(matField.getName()).append("' THEN value END) AS ").append(matField.getName());
+            }
+            sql.append(" FROM man_order_detl_field ");
+            sql.append(" GROUP BY _detl_id ");
+
+            return sql.toString();
+        }
+
+        public String createViewOrderDetlSql() {
+            StringBuilder sql = new StringBuilder();
+
+            sql.append(" CREATE OR REPLACE VIEW view_man_order_detl AS \n");
+            sql.append(" select * from man_order_detl od ");
+            sql.append(" left join view_man_order_detl_field odf ");
+            sql.append(" on od.id = odf._detl_id ");
+
+            return sql.toString();
+        }
+    }
+
+}

--
Gitblit v1.9.1