From fe7eb8332cad8d7cd545f7f915eed1806de3d34a Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期四, 25 七月 2024 16:12:10 +0800
Subject: [PATCH] 新增盘点再入库

---
 src/main/resources/mapper/WrkDetlMapper.xml         |    9 +++++++++
 src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java |    3 +++
 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java |    5 +++++
 src/main/java/com/zy/common/web/WcsController.java  |    1 +
 src/main/resources/application.yml                  |    2 +-
 5 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index e10e894..15503d5 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -6,6 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 
 @Mapper
@@ -25,4 +26,6 @@
     List<WrkDetl> selectPakoutQuery(@Param("staNo")Integer staNo, @Param("matnr")String matnr);
 
     List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);
+
+    int updateIoTimeWms(@Param("workNo") Integer workNo, @Param("ioTime") Date ioTime);
 }
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 2fefe09..69a6af6 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.zy.asrs.entity.WrkMast;
+import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -20,4 +21,8 @@
     @Select("select count(1) from asr_wrk_mast where 1=1 and io_type = #{ioType} and sta_no = #{staNo}")
     int selectWrkMastBareBoardStaNo(Integer ioType,Integer staNo);
 
+    // work log -------------------------------------------------------
+    @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
+    int saveWrkMastLog(Integer workNo);
+
 }
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index fd6bd8a..04b91f3 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -112,6 +112,7 @@
     @ResponseBody
     @Transactional
     public synchronized R getLocNo2(@RequestBody SearchLocParam param) {
+        log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰2====>>鍏ュ弬:{}", param);
         if (Cools.isEmpty(param.getIoType())) {
             return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
         }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5259bcd..16a3003 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8084
+  port: 8080
   servlet:
     context-path: /@pom.build.finalName@
 
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index e94832f..c8c7903 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -124,4 +124,13 @@
         group by awdl.wrk_no, awdl.io_time, awdl.matnr ,awdl.zpallet,awdl.specs,awdl.maktx
     </select>
 
+
+
+    <update id="updateIoTimeWms">
+        update asr_wrk_detl
+        set io_time = #{ioTime}
+        where 1=1
+        and wrk_no = #{workNo}
+    </update>
+
 </mapper>

--
Gitblit v1.9.1