From 15c0000d712dac810607c314a5966998ce440922 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 14 八月 2024 09:29:48 +0800
Subject: [PATCH] 最新版本

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
index 2560fdc..86f8137 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
@@ -92,6 +92,7 @@
                     entity.setIocode(d.getIoCode());
                     entity.setJobId(job.getId());
                     entity.setIoQty(d.getIoQty());
+                    entity.setStatus(Constants.ZERO);
                     entity.setRate(d.getRate());
                     entity.setMaterialName(d.getMaterialName());
                     entity.setInRepertotyCode(d.getInRepertotyCode());
@@ -131,7 +132,8 @@
         job.setType(Constants.platformJobType.wxcxh);//榛樿鏄鍗忚溅鍗歌揣
         job.setStatus(Constants.PlatformJobStatus.WAIT_CONFIRM.getKey());//榛樿寰呯‘璁ょ姸鎬�
         Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
-                .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in()) as jobNum")
+                .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in("+
+                        Constants.PlatformJobStatus.LEAVED+")) as jobNum")
                 .lambda()
                 .eq(Cars::getIsdeleted,Constants.ZERO)
                 .eq(Cars::getType,Constants.ONE)
@@ -154,7 +156,8 @@
         job.setType(Constants.platformJobType.wxczh);//榛樿鏄鍗忚溅瑁呭ソ
         job.setStatus(Constants.PlatformJobStatus.WAIT_CONFIRM.getKey());//榛樿寰呯‘璁ょ姸鎬�
         Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
-                .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in()) as jobNum")
+                .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in("+
+                        Constants.PlatformJobStatus.LEAVED+")) as jobNum")
                 .lambda()
                 .eq(Cars::getIsdeleted,Constants.ZERO)
                 .eq(Cars::getType,Constants.ONE)
@@ -223,6 +226,7 @@
                     entity.setIocode(d.getIoCode());
                     entity.setJobId(job.getId());
                     entity.setIoQty(d.getIoQty());
+                    entity.setStatus(Constants.ZERO);
                     entity.setRate(d.getRate());
                     entity.setMaterialName(d.getMaterialName());
                     iocodeList.add(d.getIoCode());
@@ -269,11 +273,18 @@
      */
     @Override
     public WmsBaseResponse cancelOutbound(List<WmsActionNoticeRequest> list) {
-        //TODO-------------------澶勭悊鍑哄簱鍙栨秷閫氱煡涓氬姟--------------------
         if(list ==null || list.size() ==0){
             return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
         }
-
+        List<String> iocodeList = new ArrayList<>();
+        for(WmsActionNoticeRequest param :list){
+            iocodeList.add(param.getIoCode());
+        }
+        //鍙栨秷鍏ㄩ儴鏁版嵁鐘舵�佷负 銆愬凡鍙栨秷銆�
+         platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
+                .set(PlatformWmsDetail::getStatus,Constants.TWO)
+                .in(PlatformWmsDetail::getIocode,iocodeList)
+                .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
         return returnSuccessReuslt(null);
     }
     /**
@@ -283,10 +294,18 @@
      */
     @Override
     public WmsBaseResponse doneTask(List<WmsActionNoticeRequest> list) {
-        //TODO-------------------澶勭悊鍑哄叆搴撲綔涓氬畬鎴愰�氱煡涓氬姟--------------------
         if(list ==null || list.size() ==0){
             return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
         }
+        List<String> iocodeList = new ArrayList<>();
+        for(WmsActionNoticeRequest param :list){
+            iocodeList.add(param.getIoCode());
+        }
+        //鍙栨秷鍏ㄩ儴鏁版嵁鐘舵�佷负 銆愬凡瀹屾垚銆�
+        platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
+                .set(PlatformWmsDetail::getStatus,Constants.ONE)
+                .in(PlatformWmsDetail::getIocode,iocodeList)
+                .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
 
         return returnSuccessReuslt(null);
     }

--
Gitblit v1.9.3