From 057e2cd464cc8773672ae6ddac7d32eb8cbc3a1f Mon Sep 17 00:00:00 2001 From: lsh <lsh123456> Date: 星期一, 15 七月 2024 13:27:33 +0800 Subject: [PATCH] # --- src/main/resources/mapper/WrkDetlMapper.xml | 8 ++ src/main/resources/mapper/WrkDetlLogMapper.xml | 8 ++ src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java | 2 src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java | 6 ++ src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java | 3 + src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 5 + src/main/java/com/zy/asrs/controller/MobileController.java | 74 +++++++++++++----------- src/main/java/com/zy/asrs/service/WrkDetlLogService.java | 3 + src/main/resources/application.yml | 14 ++-- src/main/java/com/zy/asrs/service/WrkDetlService.java | 2 10 files changed, 85 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java index 3b41da0..8eb092a 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -215,17 +215,19 @@ @ManagerAuth(memo = "鍑哄簱纭鑾峰彇淇℃伅") public R wrkDetlSearchByBatch(@RequestBody String batch){ if (Cools.isEmpty(batch)){ - return R.error("鍙傛暟涓虹┖"); + return R.error().add("鍙傛暟涓虹┖"); } String[] batch1 = batch.split("绠卞彿锛�"); String[] batch2 = batch1[1].split("瑙勬牸锛�"); batch = batch2[0]; // List<Order> orders = orderService.selectorderNoL(batch); - WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false)); + WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(batch); +// WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false)); if (Cools.isEmpty(wrkDetl)){ - WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false)); + WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlByOrderNoNotNull(batch); +// WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false)); if (Cools.isEmpty(wrkDetlLog)){ - return R.error("鏈煡鍒版暟鎹�"); + return R.error().add("鏈煡鍒版暟鎹�"); } wrkDetl = new WrkDetl(); wrkDetl.sync(wrkDetlLog); @@ -234,7 +236,7 @@ wrkDetl.setDeadTime(wrkDetlLog.getDeadTime()); } if (Cools.isEmpty(wrkDetl)){ - return R.error("鏈煡鍒版暟鎹�"); + return R.error().add("鏈煡鍒版暟鎹�"); } return R.ok().add(wrkDetl); } @@ -242,37 +244,43 @@ @RequestMapping("/order/search/batch/auth") @ManagerAuth(memo = "鍑哄簱纭") public R orderSearchByBatch(@RequestBody String batch){ - if (Cools.isEmpty(batch)){ - return R.error("鍙傛暟涓虹┖"); - } - String[] batch1 = batch.split("绠卞彿锛�"); - String[] batch2 = batch1[1].split("瑙勬牸锛�"); - batch = batch2[0]; - String orderNo = ""; - WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false)); - if (Cools.isEmpty(wrkDetl)) { - WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false)); - if (Cools.isEmpty(wrkDetlLog)) { - return R.error("鏈煡鍒版暟鎹�"); + try{ + if (Cools.isEmpty(batch)){ + return R.error().add("鍙傛暟涓虹┖"); } - orderNo=wrkDetlLog.getOrderNo(); - }else { - orderNo=wrkDetl.getOrderNo(); - } + String[] batch1 = batch.split("绠卞彿锛�"); + String[] batch2 = batch1[1].split("瑙勬牸锛�"); + batch = batch2[0]; + String orderNo = ""; +// WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false)); + WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(batch); + if (Cools.isEmpty(wrkDetl)) { +// WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false)); + WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlByOrderNoNotNull(batch); + if (Cools.isEmpty(wrkDetlLog)) { + return R.error().add("鏈煡鍒版暟鎹�:宸ヤ綔鏄庣粏涓虹┖"); + } + orderNo=wrkDetlLog.getOrderNo(); + }else { + orderNo=wrkDetl.getOrderNo(); + } // List<Order> orders = orderService.selectorderNoL(batch); - OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("batch", batch).eq("order_no",orderNo)); - if (Cools.isEmpty(orderDetl)){ - return R.error("鏈煡鍒版暟鎹�"); + OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("batch", batch).eq("order_no",orderNo)); + if (Cools.isEmpty(orderDetl)){ + return R.error().add("鏈煡鍒版暟鎹�:璁㈠崟鏄庣粏涓虹┖"+orderNo); + } + if (!orderDetl.getQty$().equals("宸插畬鎴�")){ + return R.error().add("浠诲姟鏈畬鎴�"); + } + if (orderDetl.getSource()==1){ + return R.error().add("浠诲姟宸茬‘璁わ紝璇峰嬁閲嶅纭锛侊紒锛�"); + } + orderDetl.setSource(1); + orderDetlService.updateById(orderDetl); + return R.ok(); + } catch (Exception e){ + return R.error().add(e); } - if (!orderDetl.getQty$().equals("宸插畬鎴�")){ - return R.error("浠诲姟鏈畬鎴�"); - } - if (orderDetl.getSource()==1){ - return R.error("浠诲姟宸茬‘璁わ紝璇峰嬁閲嶅纭锛侊紒锛�"); - } - orderDetl.setSource(1); - orderDetlService.updateById(orderDetl); - return R.ok(); } // @RequestMapping("/truss/auth") diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java index 4860d03..6679898 100644 --- a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java +++ b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java @@ -1,5 +1,6 @@ package com.zy.asrs.mapper; +import com.zy.asrs.entity.WrkDetl; import com.zy.asrs.entity.WrkDetlLog; import com.baomidou.mybatisplus.mapper.BaseMapper; import org.apache.ibatis.annotations.Insert; @@ -41,5 +42,7 @@ @Param("modiTimeStart") Date modiTimeStart, @Param("modiTimeEnd") Date modiTimeEnd); + WrkDetlLog selectWrkDetlByOrderNoNotNull(@Param("batch") String batch); + } diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java index 187a8b5..53e6b62 100644 --- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java +++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java @@ -30,5 +30,7 @@ int updateIoTimeWms(@Param("workNo") Integer workNo, @Param("ioTime") Date ioTime); + WrkDetl selectWrkDetlByOrderNoNotNull(@Param("batch") String batch); + } diff --git a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java index 0f81bd0..8416923 100644 --- a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java +++ b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java @@ -1,5 +1,6 @@ package com.zy.asrs.service; +import com.zy.asrs.entity.WrkDetl; import com.zy.asrs.entity.WrkDetlLog; import com.baomidou.mybatisplus.service.IService; @@ -14,4 +15,6 @@ Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,Double anfme, Date modiTimeStart, Date modiTimeEnd); + WrkDetlLog selectWrkDetlByOrderNoNotNull(String batch); + } diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java index 5bb5613..5708ee0 100644 --- a/src/main/java/com/zy/asrs/service/WrkDetlService.java +++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java @@ -26,4 +26,6 @@ boolean updateIoTimeWms(Integer workNo, Date ioTime); + WrkDetl selectWrkDetlByOrderNoNotNull(String batch); + } diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java index 6fd87d0..c2d3030 100644 --- a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java @@ -1,5 +1,6 @@ package com.zy.asrs.service.impl; +import com.zy.asrs.entity.WrkDetl; import com.zy.asrs.mapper.WrkDetlLogMapper; import com.zy.asrs.entity.WrkDetlLog; import com.zy.asrs.service.WrkDetlLogService; @@ -26,4 +27,9 @@ public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,Double anfme, Date modiTimeStart, Date modiTimeEnd) { return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd); } + + @Override + public WrkDetlLog selectWrkDetlByOrderNoNotNull(String batch) { + return this.baseMapper.selectWrkDetlByOrderNoNotNull(batch); + } } diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java index 8f413d1..2b8003f 100644 --- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java @@ -94,4 +94,9 @@ public boolean updateIoTimeWms(Integer workNo, Date ioTime) { return this.baseMapper.updateIoTimeWms(workNo, ioTime) > 0; } + + @Override + public WrkDetl selectWrkDetlByOrderNoNotNull(String batch) { + return this.baseMapper.selectWrkDetlByOrderNoNotNull(batch); + } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c3e311d..126d6ee 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8083 + port: 8080 servlet: context-path: /@pom.build.finalName@ @@ -10,15 +10,15 @@ enabled: false datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://192.168.18.4:49977;databasename=srjtasrs -# username: sa -# password: sa@123 + url: jdbc:sqlserver://192.168.18.4:49977;databasename=srjtasrs + username: sa + password: sa@123 # url: jdbc:sqlserver://127.0.0.1:49977;databasename=srjtasrs # username: sa # password: sa@123 - url: jdbc:sqlserver://192.168.4.15:1433;databasename=srjtasrs - username: sa - password: sa@123 +# url: jdbc:sqlserver://192.168.4.15:1433;databasename=srjtasrs +# username: sa +# password: sa@123 mvc: static-path-pattern: /** redis: diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml index a304a2a..0169081 100644 --- a/src/main/resources/mapper/WrkDetlLogMapper.xml +++ b/src/main/resources/mapper/WrkDetlLogMapper.xml @@ -106,4 +106,12 @@ <include refid="batchSeq"></include> </select> + <select id="selectWrkDetlByOrderNoNotNull" resultMap="BaseResultMap"> + select top 1 * from asr_wrk_detl_log + where batch = #{batch} + and order_no is not null + and order_no != "" + order by io_time + </select> + </mapper> diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml index 95881a1..ac601b6 100644 --- a/src/main/resources/mapper/WrkDetlMapper.xml +++ b/src/main/resources/mapper/WrkDetlMapper.xml @@ -137,4 +137,12 @@ and wrk_no = #{workNo} </update> + <select id="selectWrkDetlByOrderNoNotNull" resultMap="BaseResultMap"> + select top 1 * from asr_wrk_detl + where batch = #{batch} + and order_no is not null + and order_no != "" + order by io_time + </select> + </mapper> -- Gitblit v1.9.1