From 252bfe6c268c95444525c16c95845a4ee8d10fd5 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 三月 2025 16:46:24 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/mapper/AgvWrkDetlMapper.java | 4 ++++
src/main/resources/四期sql/devp | 11 +++++++----
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 15 +++++++++++++++
3 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index be477d4..54bbc39 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -10,6 +10,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.AgvWrkDetl;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
@@ -393,6 +394,20 @@
return R.ok(page);
}
+ @RequestMapping(value = "/orderDetl/pakout/workNum")
+ @ManagerAuth
+ public R listWorkDetl(@RequestParam OrderDetl param) {
+ List<AgvWrkDetl> agvWrkDetls = agvWrkDetlMapper.listAnfmeByMatnr(param.getMatnr(), param.getThreeCode(), param.getOrderNo());
+ if (agvWrkDetls != null) {
+ for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
+
+ }
+ }
+ return R.ok(agvWrkDetls);
+
+ }
+
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
diff --git a/src/main/java/com/zy/asrs/mapper/AgvWrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/AgvWrkDetlMapper.java
index 0c4c476..6ad6064 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvWrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvWrkDetlMapper.java
@@ -37,4 +37,8 @@
@Select("SELECT sum(d.anfme) from agv_wrk_detl d ,agv_wrk_mast m where d.wrk_no=m.wrk_no and m.io_type in (101,103,53) and d.matnr = #{matnr} AND d.three_code = #{threeCode} AND d.order_no = #{orderNo} AND d.process_sts != 1")
Double sumAnfmeByMatnr(@Param("matnr") String matnr, @Param("threeCode") String threeCode, @Param("orderNo") String orderNo);
+
+ @Select("SELECT d.* from agv_wrk_detl d ,agv_wrk_mast m where d.wrk_no=m.wrk_no and m.io_type in (101,103,53) and d.matnr = #{matnr} AND d.three_code = #{threeCode} AND d.order_no = #{orderNo} AND d.process_sts != 1")
+ List<AgvWrkDetl> listAnfmeByMatnr(@Param("matnr") String matnr, @Param("threeCode") String threeCode, @Param("orderNo") String orderNo);
+
}
diff --git "a/src/main/resources/\345\233\233\346\234\237sql/devp" "b/src/main/resources/\345\233\233\346\234\237sql/devp"
index 3310bb3..5ed2d86 100644
--- "a/src/main/resources/\345\233\233\346\234\237sql/devp"
+++ "b/src/main/resources/\345\233\233\346\234\237sql/devp"
@@ -137,12 +137,15 @@
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_71F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:38.550', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_72F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, NULL, '2024-04-02 09:25:50.747', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_73F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_74F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:25:01.967', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_75F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, NULL, '2024-04-02 09:25:50.747', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_76F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('QO_51F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 6, 31, NULL, 133, '2024-07-04 16:24:38.550', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
-INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('QO_52F4', NULL, NULL, 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 6, 31, NULL, NULL, '2024-04-02 09:25:50.747', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('QO_52F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 6, 31, NULL, NULL, '2024-04-02 09:25:50.747', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('QO_53F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 6, 31, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
-INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('QO_54F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 6, 31, NULL, 133, '2024-07-04 16:24:38.550', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
-INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('QO_55F4', NULL, NULL, 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 6, 31, NULL, NULL, '2024-04-02 09:25:50.747', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
-INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('QO_56F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 6, 31, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
--
Gitblit v1.9.1