From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
index 2d82b49..1d48eb5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wms.apis.wcs.controller;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
@@ -21,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@@ -84,6 +86,7 @@
}
/**
+ * ESS 鎾澧欐媿鐏洖璋�
* 鎾澧欐媿鐏紝ESS璋冪敤
*/
@PostMapping("/light/off")
@@ -98,18 +101,25 @@
throw new CoolException("浜嬩欢鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
+ log.info("鎾澧欐媿鐏紝璇锋眰鍙傛暟锛歿}", JSONObject.toJSONString(request));
+
// 鏍规嵁绔欑偣缂栫爜鏌ユ挱绉嶇珯鐐逛俊鎭�
CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteNo, request.get("tagCode")));
+ if (Objects.isNull(cacheSite)) {
+ throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦紒锛�");
+ }
// 鏍规嵁鎾绔欑偣淇℃伅鏉＄爜锛屾煡浠诲姟
Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, cacheSite.getBarcode()));
+ if (Objects.isNull(task)) {
+ throw new CoolException("褰撳墠绔欑偣浠诲姟涓嶅瓨鍦紒锛�");
+ }
- request.clear();
- request.put("taskNo", task.getTaskNo());
- request.put("orderNo",cacheSite.getOrderNo());
+ Map<String, Object> param = new HashMap<>();
+ param.put("taskNo", task.getTaskNo());
+ param.put("siteNo", cacheSite.getSiteNo());
+ param.put("orderNo",cacheSite.getOrderNo());
- wcsApiService.slapLightLogic(request);
-
- return R.ok();
+ return wcsApiService.slapLightLogic(param);
}
/**
--
Gitblit v1.9.1