From 73e836a73be3470155022c433655b5c284402fe5 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 5 Jan 2025 16:58:46 +0800
Subject: [PATCH] md

---
 .../erp/apiweb/WarehouseInController.java     | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java
index cd52f26..7cf5394 100644
--- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java
+++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java
@@ -19,8 +19,10 @@ import com.xdadan.erp.common.core.page.TableDataInfo;
 import com.xdadan.erp.common.enums.BusinessType;
 import com.xdadan.erp.common.utils.poi.ExcelUtil;
 import com.xdadan.erp.emis.domain.EmisWarehouseIn;
+import com.xdadan.erp.emis.domain.EmisWarehouseInBatch;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.vo.WaybillOrder;
+import com.xdadan.erp.emis.service.IEmisWarehouseInBatchService;
 import com.xdadan.erp.emis.service.IEmisWarehouseInService;
 import com.xdadan.erp.emis.service.IEmisWaybillService;
 import com.xdadan.erp.emis.utils.WaybillHelper;
@@ -46,6 +48,9 @@ public class WarehouseInController extends BaseController
     @Autowired
     private IEmisWarehouseInService emisWarehouseInService;
 
+    @Autowired
+    private IEmisWarehouseInBatchService emisWarehouseInBatchService;
+
     @Autowired
     private IEmisWaybillService emisWaybillService;
 
@@ -118,7 +123,6 @@ public class WarehouseInController extends BaseController
         return getDataTable(list);
     }
 
-
     /**
      * 获取进仓单详细信息
      */
@@ -156,4 +160,40 @@ public class WarehouseInController extends BaseController
         }
     }
 
+
+    @Log(title = "客户进仓单确认", businessType = BusinessType.UPDATE)
+    @RequestMapping("/cusConfirmWsIn")
+    public AjaxResult cusConfirmWsIn(@RequestBody EmisWarehouseInBatch emisWarehouseInBatch)
+    {
+        try {
+            // 部分确认
+            if(!StringUtils.isEmpty(emisWarehouseInBatch.getSerialNo())) {
+                return toAjax(emisWarehouseInBatchService.cusConfirmBatchWsInByOms(emisWarehouseInBatch));
+            }
+            // 全部确认
+            else{
+                return toAjax(emisWarehouseInBatchService.cusConfirmAllWsInByOms(emisWarehouseInBatch));
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return AjaxResult.error(ex.getMessage());
+        }
+    }
+
+
+    @Log(title = "异常上报", businessType = BusinessType.UPDATE)
+    @RequestMapping("/reportBatchWsInError")
+    public AjaxResult reportBatchWsInError(@RequestBody EmisWarehouseInBatch emisWarehouseInBatch)
+    {
+        try {
+            return toAjax(emisWarehouseInBatchService.updateAbnormalByOms(emisWarehouseInBatch));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return AjaxResult.error(ex.getMessage());
+        }
+    }
+
+
+
+
 }