From 01ed85818b7062ba9a7f396df8122c8e1d168b64 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期二, 17 十二月 2024 14:13:14 +0800
Subject: [PATCH] 完善
---
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java | 11 ++++++++---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java | 27 +++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
index 66fa86c..4ec8359 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
@@ -125,6 +125,7 @@
Order order = orderService.selectByNo(param.getOrderNo(), param.getHostId());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
boolean boo = false;
+ boolean b = false;
if (!Cools.isEmpty(order)) {
List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>()
.eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, param.getHostId()));
@@ -132,14 +133,18 @@
if (orderDetls.size() == param.getMats().size()) {
for (OrderDetl o : orderDetls
) {
+
for (GenerateOrderMatParam matParam : param.getMats()
) {
if (o.getMatnr().equals(matParam.getMatnr()) && !o.getAnfme().equals(matParam.getAnfme())) {
boo = true;
break;
}
+ if (o.getMatnr().equals(matParam.getMatnr())) {
+ b = true;
+ }
}
- if (boo) {
+ if (boo || !b) {
break;
}
}
@@ -147,7 +152,7 @@
boo = true;
}
}
- if (boo) {
+ if (boo || (!b && !Cools.isEmpty(order))) {
if (order.getSettle() > 1L) {
throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
}
@@ -226,7 +231,7 @@
}
}
}
- if(!boo&&Cools.isEmpty(order)){
+ if (!boo && Cools.isEmpty(order)) {
DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, param.getOrderType()));
if (docType == null) {
throw new CoolException("璁㈠崟绫诲瀷涓嶅瓨鍦�");
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
index 243b26a..8c664ac 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
@@ -13,6 +13,7 @@
import com.zy.asrs.common.utils.WaitPakingExcelListener;
import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.entity.WaitPakin;
+import com.zy.asrs.common.wms.entity.WaitPakinLog;
import com.zy.asrs.common.wms.entity.WrkMast;
import com.zy.asrs.common.wms.service.OrderDetlService;
import com.zy.asrs.common.wms.service.WaitPakinService;
@@ -216,4 +217,30 @@
return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
}
+ @RequestMapping(value = "/waitPakin/export/auth")
+ @ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
+ public synchronized R export(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ QueryWrapper<WaitPakin> wrapper = new QueryWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("waitPakin"));
+ String row = "";
+ if (map.get("row") != null) {
+ String chooseRow = (String) map.get("row");
+ if (chooseRow.length() == 1) {
+ row = "0" + chooseRow;
+ map.remove("row");
+ }else {
+ row = chooseRow;
+ map.remove("row");
+ }
+ }
+ convert(map, wrapper);
+// if (!row.equals("")){
+// wrapper.and()
+// .where("loc_no like '" +row +"%'");
+// }
+ List<WaitPakin> list = waitPakinService.list(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
}
--
Gitblit v1.9.1