From c635d78b479510ebe2556a420948effcd30a0731 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 21 十二月 2024 18:40:43 +0800
Subject: [PATCH] 新建德森项目分支
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinRuleServiceImpl.java | 116 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinRuleServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinRuleServiceImpl.java
index 89fffc5..4a62f25 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinRuleServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinRuleServiceImpl.java
@@ -1,58 +1,58 @@
-package com.zy.asrs.wms.asrs.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.framework.exception.CoolException;
-import com.zy.asrs.wms.asrs.entity.WaitPakin;
-import com.zy.asrs.wms.asrs.mapper.WaitPakinRuleMapper;
-import com.zy.asrs.wms.asrs.entity.WaitPakinRule;
-import com.zy.asrs.wms.asrs.service.WaitPakinRuleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.wms.asrs.service.WaitPakinService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("waitPakinRuleService")
-public class WaitPakinRuleServiceImpl extends ServiceImpl<WaitPakinRuleMapper, WaitPakinRule> implements WaitPakinRuleService {
-
- @Autowired
- private WaitPakinService waitPakinService;
-
- @Override
- public boolean rule(WaitPakin waitPakin) {
- List<WaitPakinRule> list = this.list(new LambdaQueryWrapper<WaitPakinRule>().eq(WaitPakinRule::getStatus, 1).orderByDesc(WaitPakinRule::getId));
- if (list.isEmpty()) {
- return true;//鏃犺鍒欙紝鐩存帴鏀捐
- }
-
- List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
- if(waitPakins.isEmpty()) {
- return true;//鏃犳墭鐩橈紝鏀捐
- }
-
- WaitPakinRule waitPakinRule = list.get(0);
- //鍒ゆ柇鏄惁娣疯浇
- if (waitPakinRule.getPalletMixed() == 1) {
- //娣疯浇
- //鍒ゆ柇鏄惁鍏佽澶氳鍗�
- if (waitPakinRule.getPalletOrder() == 0) {
- //鍗曡鍗�
- for (WaitPakin pakin : waitPakins) {
- if (!pakin.getOrderId().equals(waitPakin.getOrderId())) {
- throw new CoolException("鎵樼洏涓嶅厑璁稿璁㈠崟");
- }
- }
- }
-
- }else {
- //鍗曟斁
- //鍒ゆ柇缁勬墭閫氱煡妗ｆ槸鍚﹀凡缁忓瓨鍦ㄦ墭鐩�
- if(!waitPakins.isEmpty()) {
- throw new CoolException("鎵樼洏宸茬粍鎵�");
- }
- }
-
- return false;
- }
-}
+package com.zy.asrs.wms.asrs.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.asrs.entity.WaitPakin;
+import com.zy.asrs.wms.asrs.mapper.WaitPakinRuleMapper;
+import com.zy.asrs.wms.asrs.entity.WaitPakinRule;
+import com.zy.asrs.wms.asrs.service.WaitPakinRuleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.asrs.wms.asrs.service.WaitPakinService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("waitPakinRuleService")
+public class WaitPakinRuleServiceImpl extends ServiceImpl<WaitPakinRuleMapper, WaitPakinRule> implements WaitPakinRuleService {
+
+ @Autowired
+ private WaitPakinService waitPakinService;
+
+ @Override
+ public boolean rule(WaitPakin waitPakin) {
+ List<WaitPakinRule> list = this.list(new LambdaQueryWrapper<WaitPakinRule>().eq(WaitPakinRule::getStatus, 1).orderByDesc(WaitPakinRule::getId));
+ if (list.isEmpty()) {
+ return true;//鏃犺鍒欙紝鐩存帴鏀捐
+ }
+
+ List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
+ if(waitPakins.isEmpty()) {
+ return true;//鏃犳墭鐩橈紝鏀捐
+ }
+
+ WaitPakinRule waitPakinRule = list.get(0);
+ //鍒ゆ柇鏄惁娣疯浇
+ if (waitPakinRule.getPalletMixed() == 1) {
+ //娣疯浇
+ //鍒ゆ柇鏄惁鍏佽澶氳鍗�
+ if (waitPakinRule.getPalletOrder() == 0) {
+ //鍗曡鍗�
+ for (WaitPakin pakin : waitPakins) {
+ if (!pakin.getOrderId().equals(waitPakin.getOrderId())) {
+ throw new CoolException("鎵樼洏涓嶅厑璁稿璁㈠崟");
+ }
+ }
+ }
+
+ }else {
+ //鍗曟斁
+ //鍒ゆ柇缁勬墭閫氱煡妗ｆ槸鍚﹀凡缁忓瓨鍦ㄦ墭鐩�
+ if(!waitPakins.isEmpty()) {
+ throw new CoolException("鎵樼洏宸茬粍鎵�");
+ }
+ }
+
+ return false;
+ }
+}
--
Gitblit v1.9.1