From 08b4403ec8d6b69528d161cfcad80b5d64dea76c Mon Sep 17 00:00:00 2001
From: Administrator <876263681@qq.com>
Date: 星期三, 02 七月 2025 15:12:43 +0800
Subject: [PATCH] #优化库位检索
---
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 87 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 82 insertions(+), 5 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 5a3dc21..8126ad5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -1,21 +1,35 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.OrderDetlService;
+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 org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@Service("orderDetlService")
public class OrderDetlServiceImpl extends ServiceImpl<OrderDetlMapper, OrderDetl> implements OrderDetlService {
+ @Resource
+ private OrderDetlMapper orderDetlMapper;
+
@Override
public List<OrderDetl> selectByOrderId(Long orderId) {
return this.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
+ }
+
+ @Override
+ public Page<OrderDetl> getPakoutPage(Page<OrderDetl> page) {
+ page.setRecords(baseMapper.getPakoutPage(page.getCondition()));
+ page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
+ return page;
}
@Override
@@ -47,7 +61,12 @@
@Override
public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
- return this.baseMapper.decrease(orderNo, matnr, batch, qty) > 0;
+ int decrease = this.baseMapper.decrease(orderNo, matnr, batch, qty);
+ if (decrease == 0) {
+ return this.baseMapper.decrease(orderNo, matnr, null, qty) > 0;
+ } else {
+ return true;
+ }
}
@Override
@@ -55,4 +74,62 @@
return this.baseMapper.modifyStatus(orderId, status) > 0;
}
+ @Override
+ public boolean addToLogTable(OrderDetl orderDetl) {
+ return this.baseMapper.addToLogTable(orderDetl) > 0;
+ }
+
+ @Override
+ public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
+ return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, qty) > 0;
+ }
+
+ /**
+ * 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+ * @param orderId
+ * @param matnr
+ * @param batch
+ * @param workQty
+ * @return
+ */
+ @Override
+ public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
+ return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty) > 0;
+ }
+
+ @Override
+ public Boolean checkAllDetlFinish(String orderNo) {
+ return this.baseMapper.checkAllDetlFinish(orderNo) <= 0 ;
+ }
+
+ /**
+ * 鑾峰彇鐩稿悓鍗曞彿锛岀浉鍚屾壒鍙凤紝鐩稿悓鐗╂枡浠ｇ爜宸茬粡鍦ㄥ叆搴撻�氱煡妗ｉ噷缁勬墭鐨勬暟閲�
+ * @param orderNo
+ * @param matnr
+ * @param batch
+ * @return
+ */
+ @Override
+ public Integer sameOrderComb(String orderNo, String matnr, String batch) {
+ Integer sum = this.baseMapper.sameOrderComb(orderNo, matnr, batch);
+ return sum != null ? sum : 0;
+ }
+
+ @Override
+ public boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty) {
+ return this.baseMapper.increaseAnfme(orderId, matnr, batch, qty) > 0;
+ }
+
+ @Override
+ public Map<String, Long> selectCountByMatnr(String matnr, String batch) {
+ Map<String,Long> map = new HashMap<>();
+ map.put("asrCount",orderDetlMapper.selectCountToAsrByMatnr(matnr, batch));
+ map.put("manCount",orderDetlMapper.selectCountToManByMatnr(matnr, batch));
+ return map;
+ }
+
+ @Override
+ public boolean increaseWorkQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
+ return this.baseMapper.increaseWorkQtyByOrderNo(orderNo, matnr, batch, qty) > 0;
+ }
}
--
Gitblit v1.9.1