From d0226747665355acecd5b4f2b5c0beb020586729 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 17 一月 2025 15:37:32 +0800
Subject: [PATCH] # 23. PDA拣货单据，勾选或点击确认按钮后，完成当前单据 （已完成） 24. PDA出库成功后，界面数据重置，避免重复操作 （已修复） 25. PDA接口请求，添加一个Loading遮档 （已修复） 27. 非平库单据，在平库可做入库操作 （已修复） 28. 平库已组拖数据，组拖完成后依然可组拖 （已修复） 29. 平库入库后，订单明细没有添加（已修复） 30. 平库入库后，单据类型没有修改（已修复） 31. 没有绑定播种位，不能进行播种，前后端都需加判定（已修复） 33. 平库入库未修改入库已完成数量（已修复） 34. cacheSite缓存站点逻辑需重新梳理，入库生成波次时（已完成） 35. PDA添加发货确认，默认全选 （已修复） 36. 大屏获取任务时，是由容器到达的拖盘码确认通知 （已修复） 37. 拣货单序号不显示 问题修复 （已修复） 42. pda发货确认，添加不同颜色区分是否全部完成拣货，绿色全部拣货完成，红色完成部分拣货（已修复） 43. CTU入库完成后，订单明细没有删除，执行中数量清空（已修复） 44. 平库入库完成后，历史档明细完成数量没有更新 （已修复） 45. PDA料号不显示 （已修复） 46. 发货完成后，波次管理数据未加入历史档 （已修复）
---
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