From 3a4a6deaf521bc29730f3543d4a0cb726a777ce2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 08 七月 2020 14:42:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/OutLocDto.java | 25 +++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2 ++
2 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 4e8fe30..17881b6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -162,6 +162,8 @@
}
// 鐢熸垚宸ヤ綔妗�
for (OutLocDto dto : dtos) {
+ // 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
+ ioType = (dto.isAll() && (ioType==101||ioType==103))?101:103;
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(dto.getLocNo());
// 鑾峰彇璺緞
diff --git a/src/main/java/com/zy/common/model/OutLocDto.java b/src/main/java/com/zy/common/model/OutLocDto.java
index ba007e0..c990d89 100644
--- a/src/main/java/com/zy/common/model/OutLocDto.java
+++ b/src/main/java/com/zy/common/model/OutLocDto.java
@@ -1,5 +1,10 @@
package com.zy.common.model;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.SpringUtils;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.service.LocDetlService;
+
import java.util.List;
/**
@@ -34,4 +39,24 @@
public void setLocDetlDtos(List<LocDetlDto> locDetlDtos) {
this.locDetlDtos = locDetlDtos;
}
+
+ public boolean isAll(){
+ // 鏌ヨ褰撳墠搴撲綅鍙锋墍鏈夌殑搴撳瓨鏄庣粏
+ LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", this.locNo));
+ if (locDetls == null || locDetls.isEmpty()){
+ return true;
+ }
+ int sameNumber = 0;
+ for (LocDetl locDetl : locDetls) {
+ for (LocDetlDto dto : this.locDetlDtos) {
+ if (dto.getLocDetl().getMatnr().equals(locDetl.getMatnr()) && dto.getCount().equals(locDetl.getAnfme())) {
+ sameNumber++;
+ break;
+ }
+ }
+ }
+ return sameNumber == locDetls.size();
+ }
+
}
--
Gitblit v1.9.1