From 1e6b30752b8fe98ea42f33ab2ca8d2da421348a9 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 5 Jan 2025 16:51:56 +0800
Subject: [PATCH] md

---
 .../emis/mapper/EmisWarehouseInBatchMapper.java |  6 +++++-
 .../service/IEmisWarehouseInBatchService.java   |  6 +++++-
 .../impl/EmisWarehouseInBatchServiceImpl.java   | 17 +++++++++++++++--
 .../mapper/EmisWarehouseInBatchMapper.xml       | 14 +++++++++++++-
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java
index b27b5deb5..db90a13a0 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java
@@ -57,7 +57,11 @@ public interface EmisWarehouseInBatchMapper extends BaseMapper<EmisWarehouseInBa
     public int updateEmisWarehouseInBatch(EmisWarehouseInBatch emisWarehouseInBatch);
 
 
-    public int updateAbnormalBySerialNo(EmisWarehouseInBatch emisWarehouseInBatch);
+    public int updateAbnormalByOms(EmisWarehouseInBatch emisWarehouseInBatch);
+
+    public int cusConfirmBatchWsInByOms(EmisWarehouseInBatch emisWarehouseInBatch);
+
+    public int cusConfirmAllWsInByOms(EmisWarehouseInBatch emisWarehouseInBatch);
 
     /**
      * 删除
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInBatchService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInBatchService.java
index 5db0b9fda..5667d4854 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInBatchService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInBatchService.java
@@ -52,7 +52,11 @@ public interface IEmisWarehouseInBatchService
      */
     public int updateEmisWarehouseInBatch(EmisWarehouseInBatch emisWarehouseInBatch);
 
-    public int updateAbnormalBySerialNo(EmisWarehouseInBatch emisWarehouseInBatch);
+    public int updateAbnormalByOms(EmisWarehouseInBatch emisWarehouseInBatch);
+
+    public int cusConfirmBatchWsInByOms(EmisWarehouseInBatch emisWarehouseInBatch);
+
+    public int cusConfirmAllWsInByOms(EmisWarehouseInBatch emisWarehouseInBatch);
 
 
     /**
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
index dcfd1bb16..5ea05e097 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
@@ -206,11 +206,24 @@ public class EmisWarehouseInBatchServiceImpl extends EmisBaseService implements
     }
 
     @Override
-    public int updateAbnormalBySerialNo(EmisWarehouseInBatch emisWarehouseInBatch)
+    public int updateAbnormalByOms(EmisWarehouseInBatch emisWarehouseInBatch)
     {
-        return emisWarehouseInBatchMapper.updateAbnormalBySerialNo(emisWarehouseInBatch);
+        return emisWarehouseInBatchMapper.updateAbnormalByOms(emisWarehouseInBatch);
     }
 
+    @Override
+    public int cusConfirmBatchWsInByOms(EmisWarehouseInBatch emisWarehouseInBatch)
+    {
+        return emisWarehouseInBatchMapper.cusConfirmBatchWsInByOms(emisWarehouseInBatch);
+    }
+
+    @Override
+    public int cusConfirmAllWsInByOms(EmisWarehouseInBatch emisWarehouseInBatch)
+    {
+        return emisWarehouseInBatchMapper.cusConfirmAllWsInByOms(emisWarehouseInBatch);
+    }
+
+
     /**
      * 批量删除进仓单批次
      * 
diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
index d20fb59d1..77d97592e 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
@@ -239,11 +239,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <update id="updateAbnormalBySerialNo" parameterType="EmisWarehouseInBatch">
+    <update id="updateAbnormalByOms" parameterType="EmisWarehouseInBatch">
         update emis_warehouse_in_batch set bl_abnormal = '1',abnormal_date=now(),abnormal_desc = #{abnormalDesc}
         where serial_no = #{serialNo}
     </update>
 
+    <!-- 单次入库确认 -->
+    <update id="cusConfirmBatchWsInByOms" parameterType="EmisWarehouseIn">
+        update emis_warehouse_in_batch set confirm_status=#{confirmStatus},confirm_date=now()
+        where in_no = #{inNo} and serial_no = #{serialNo}  and customer_code = #{customerCode}
+    </update>
+
+    <!-- 全部入库确认 -->
+    <update id="cusConfirmAllWsInByOms" parameterType="EmisWarehouseIn">
+        update emis_warehouse_in set confirm_status=#{confirmStatus},confirm_date=now()
+        where in_no = #{inNo} and customer_code = #{customerCode}
+    </update>
+
 
     <delete id="deleteEmisWarehouseInBatchById" parameterType="Long">
         update emis_warehouse_in_batch set del_flag='1' where id = #{id}