From 559b2321be06967f32eb40ba434790b735d7fa33 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 07 十一月 2023 16:53:55 +0800
Subject: [PATCH] 出库时，检测到选择的站点没有空的暂存位，则等成等待任务，等待任务的出库站点暂时不分配。 新增定时处理等待任务
---
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index aa0f93e..46f1a15 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -1,12 +1,14 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.utils.Utils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -36,6 +38,16 @@
@Override
public OrderDetl selectItem(String orderNo, String matnr, String batch) {
return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
+ }
+
+ @Override
+ public OrderDetl selectItemNoneOfBatch(String orderNo, String matnr) {
+ return this.baseMapper.selectItemNoneOfBatch(orderNo, matnr);
+ }
+
+ @Override
+ public OrderDetl selectItemOfBatch(String matnr, String batch) {
+ return this.baseMapper.selectItemOfBatch(matnr, batch);
}
@Override
@@ -81,16 +93,26 @@
}
@Override
- public OrderDetl selectByMatnr(String matnr) {
- List<OrderDetl> orderDetls = this.baseMapper.selectByMatnr(matnr);
- if (!Cools.isEmpty(orderDetls)) {
- if (orderDetls.size() > 1) {
- log.error("{}鏉＄爜鍚屾椂瀛樺湪澶氱瑪璁㈠崟锛岃娉ㄦ剰鏌ョ湅锛�", matnr);
- } else {
- return orderDetls.get(0);
- }
- }
- return null;
+ public OrderDetl selectContainBatch(String batch) {
+ OrderDetl orderDetl = this.selectOne(new EntityWrapper<OrderDetl>().like("batch", batch));
+ return orderDetl;
+// if (!Cools.isEmpty(orderDetls)) {
+// if (orderDetls.size() > 1) {
+// log.error("{}鏉＄爜鍚屾椂瀛樺湪澶氱瑪璁㈠崟锛岃娉ㄦ剰鏌ョ湅锛�", matnr);
+// } else {
+// return orderDetls.get(0);
+// }
+// }
+// return null;
+ }
+
+ @Override
+ public OrderDetl selectByOrderNoAndMatnr(String orderNo, String matnr, String csocode, String isoseq) {
+ Wrapper<OrderDetl> wrapper = new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("matnr", matnr);
+ Utils.wapperSetCondition(wrapper,"csocode",csocode);
+ Utils.wapperSetCondition(wrapper,"isoseq",isoseq);
+
+ return this.selectOne(wrapper);
}
--
Gitblit v1.9.1