From 4f770eb094e10a310e494a304dce6756d3dd99e2 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 27 十一月 2024 15:43:06 +0800
Subject: [PATCH] ioType=3不判断库位

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 37969e5..7959a57 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1436,7 +1436,7 @@
     @Override
     public R pdaFxprk(GwmsGenerateInventoryDto param, Long userId) {
 
-        if (Cools.isEmpty(param)) {
+        if (Cools.isEmpty(param,param.getMatList())) {
             throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖锛�" + param);
         }
         if (Cools.isEmpty(param.getBarcode())) {
@@ -1817,6 +1817,27 @@
        return R.ok("璋冩暣鎴愬姛");
     }
 
+    @Override
+    public R pdaFhhd(PdaDhhdParam param, Long userId) {
+
+        String orderNo = param.getOrderNo();
+
+        Order order = orderService.selectByNo(orderNo);
+        if (order == null) {
+            return R.parse("鍗曟嵁缂栧彿涓嶅瓨鍦細" + orderNo);
+        } else if (!order.getSettle().equals(4L)) {
+            return R.parse("鍗曟嵁鐘舵�佷笉涓�4.宸插畬鎴�");
+        }
+
+        order.setSettle(5L);
+        order.setUpdateBy(userId);
+        order.setUpdateTime(new Date());
+
+        orderService.updateById(order);
+
+        return R.ok("鍙戣揣鏍稿鎴愬姛");
+    }
+
     // 鍚屾鐩樼偣寮傚父璋冩暣缁撴灉缁檓es
     void kctzPushMes(JSONObject jsonObject) {
         // 鎺ュ彛璇锋眰缁撴灉

--
Gitblit v1.9.1