From 875a183c5d5a12a4ba5c8d37559295ac1ce6cce3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 09 七月 2025 21:13:11 +0800
Subject: [PATCH] 播种流程优化
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java | 6 +
zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml | 44 +++++-----
construction-data/src/components/datav/index.vue | 6
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java | 52 ++++++------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java | 13 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 44 +++++-----
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java | 3
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 25 +++---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java | 11 +-
11 files changed, 118 insertions(+), 90 deletions(-)
diff --git a/construction-data/src/components/datav/index.vue b/construction-data/src/components/datav/index.vue
index 783dd6e..ef879b2 100644
--- a/construction-data/src/components/datav/index.vue
+++ b/construction-data/src/components/datav/index.vue
@@ -83,8 +83,8 @@
<!-- </el-col>-->
<!-- </el-row>-->
<div class="pick-wall-box">
- <el-col :span="6" v-for="(item, index) in seedBracket" :key="index">
- <div class="seed-bracket" :style="getLightStatus(item)" @click.native="lightClick(item)"/>
+ <el-col :span="6" v-for="(item, index) in seedBracket" :key="index" @click.native="lightClick(item)">
+ <div class="seed-bracket" :style="getLightStatus(item)" />
</el-col>
</div>
</dv-border-box-11>
@@ -103,7 +103,7 @@
<el-row>
<el-col class="header-title">澶嶆牳褰撳墠浣滀笟涓暟閲�</el-col>
<el-col style="text-align: center">
- <el-col :span="10" class="content">鎬婚渶姹傛暟閲忥細</el-col>
+ <el-col :span="10" class="content">闇�姹傛暟閲忥細</el-col>
<el-col :span="8" class="content-value">{{ selected.anfme }}</el-col>
</el-col>
<el-col>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
index 1d48eb5..1ce5d11 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
@@ -11,10 +11,13 @@
import com.zy.asrs.wms.apis.wcs.services.WcsApiService;
import com.zy.asrs.wms.asrs.entity.CacheSite;
import com.zy.asrs.wms.asrs.entity.Task;
+import com.zy.asrs.wms.asrs.entity.WaveSeed;
import com.zy.asrs.wms.asrs.entity.param.BindPlatformParam;
import com.zy.asrs.wms.asrs.service.CacheSiteService;
import com.zy.asrs.wms.asrs.service.PlatformService;
import com.zy.asrs.wms.asrs.service.TaskService;
+import com.zy.asrs.wms.asrs.service.WaveSeedService;
+import com.zy.asrs.wms.asrs.service.impl.WaveSeedServiceImpl;
import com.zy.asrs.wms.system.controller.BaseController;
import io.netty.util.internal.StringUtil;
import lombok.extern.slf4j.Slf4j;
@@ -42,6 +45,9 @@
@Resource
private TaskService taskService;
+
+ @Autowired
+ private WaveSeedService waveSeedService;
/**
@@ -108,8 +114,13 @@
if (Objects.isNull(cacheSite)) {
throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦紒锛�");
}
+
+ WaveSeed waveSeed = waveSeedService.getOne(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getSiteNo, request.get("tagCode").toString()));
+ if (Objects.isNull(waveSeed)) {
+ throw new CoolException("鎾澧欏湴鏍囨湭缁戝畾锛侊紒");
+ }
// 鏍规嵁鎾绔欑偣淇℃伅鏉＄爜锛屾煡浠诲姟
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, cacheSite.getBarcode()));
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, waveSeed.getTaskId()));
if (Objects.isNull(task)) {
throw new CoolException("褰撳墠绔欑偣浠诲姟涓嶅瓨鍦紒锛�");
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
index 939b96d..654aad2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
@@ -107,33 +107,36 @@
if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_ARRIVED.id
|| task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.id ) {
// 鍒拌揪鎷ｉ�変綅锛屾帶鍒舵挱绉嶅浜伅
- List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>()
- .eq(CacheSite::getBarcode, task.getBarcode()));
- if(cacheSites.size() == 0) {
+ CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>()
+ .eq(CacheSite::getChannel, task.getTargetSite())
+ .isNull(CacheSite::getOrderId).orderByAsc(CacheSite::getId));
+// List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>()
+// .eq(CacheSite::getBarcode, task.getBarcode()));
+ if(Objects.isNull(cacheSite)) {
log.error("鏉＄爜锛歿}锛屾湭鎵惧埌鎾澧欎寒鐏�",task.getBarcode());
throw new CoolException("鏈壘鍒版挱绉嶅");
}
- for (CacheSite cacheSite:cacheSites) {
- // 鑾峰彇浠诲姟鏄庣粏鏁伴噺
- List<TaskDetl> taskDetlByTaskId = taskDetlService.getTaskDetlByTaskId(task.getId());
- int sum = (int)taskDetlByTaskId.stream().mapToDouble(TaskDetl::getAnfme).sum();
- SlapLightControlParam slapLightControlParam = new SlapLightControlParam();
- slapLightControlParam
- .setControllerCode(cacheSite.getMemo())
- .setTagCode(cacheSite.getSiteNo())
- .setColor("GREEN")
- .setIndex(cacheSite.getIndex())
- .setMode("LIGHT")
- .setDisplay(sum + "");
- // 鍙戣捣浜伅璇锋眰
- log.info("浠诲姟{}鍒拌揪鎷ｉ�変綅锛屾挱绉嶅浜伅涓嬪彂",task.getTaskNo(), JSONObject.toJSONString(slapLightControlParam));
- CommonReponse response = HttpEssUtils.post("鍒拌揪鎷ｉ�変綅锛屾挱绉嶅浜伅", HttpEssUtils.PLT_SEND_COMMAND, slapLightControlParam);
- if (response.getCode().equals(0)) {
- log.info("浠诲姟{}鍒拌揪鎷ｉ�変綅锛屾挱绉嶅{}浜伅鎴愬姛",task.getTaskNo(),cacheSite.getSiteNo());
- } else {
- log.info("浠诲姟{}鍒拌揪鎷ｉ�変綅锛屾挱绉嶅{}浜伅澶辫触",task.getTaskNo(),cacheSite.getSiteNo());
- }
- }
+
+ // 鑾峰彇浠诲姟鏄庣粏鏁伴噺
+ List<TaskDetl> taskDetlByTaskId = taskDetlService.getTaskDetlByTaskId(task.getId());
+ int sum = (int)taskDetlByTaskId.stream().mapToDouble(TaskDetl::getAnfme).sum();
+ SlapLightControlParam slapLightControlParam = new SlapLightControlParam();
+ slapLightControlParam
+ .setControllerCode(cacheSite.getMemo())
+ .setTagCode(cacheSite.getSiteNo())
+ .setColor("GREEN")
+ .setIndex(cacheSite.getIndex())
+ .setMode("LIGHT")
+ .setDisplay(sum + "");
+ // 鍙戣捣浜伅璇锋眰
+ log.info("浠诲姟{}鍒拌揪鎷ｉ�変綅锛屾挱绉嶅浜伅涓嬪彂",task.getTaskNo(), JSONObject.toJSONString(slapLightControlParam));
+ CommonReponse response = HttpEssUtils.post("鍒拌揪鎷ｉ�変綅锛屾挱绉嶅浜伅", HttpEssUtils.PLT_SEND_COMMAND, slapLightControlParam);
+ if (response.getCode().equals(0)) {
+ log.info("浠诲姟{}鍒拌揪鎷ｉ�変綅锛屾挱绉嶅{}浜伅鎴愬姛",task.getTaskNo(),cacheSite.getSiteNo());
+ } else {
+ log.info("浠诲姟{}鍒拌揪鎷ｉ�変綅锛屾挱绉嶅{}浜伅澶辫触",task.getTaskNo(),cacheSite.getSiteNo());
+ }
+
boolean update = taskService.update(new LambdaUpdateWrapper<Task>()
.set(Task::getTaskSts, TaskStsType.WAVE_SEED.id)
.set(Task::getOriginSite, arrivedParam.getSlotCode())
@@ -141,7 +144,6 @@
if (!update) {
throw new CoolException("瀹瑰櫒鍒拌揪浠诲姟鏇存柊澶辫触锛侊紒");
}
-
} else if(task.getTaskSts().equals(TaskStsType.UPDATED_OUT.id)) {
ConveyorStarParam conveyorStarParam = new ConveyorStarParam();
conveyorStarParam.setSlotCode(task.getOriginSite())
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java
index a36a678..6af39ee 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java
@@ -155,7 +155,7 @@
this.siteStatus = siteStatus;
this.orderId = orderId;
this.orderNo = orderNo;
- this.barcode = barcode;
+// this.barcode = barcode;
this.hostId = hostId;
this.status = status;
this.deleted = deleted;
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java
index dbdf564..0b8b916 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java
@@ -92,6 +92,12 @@
@ApiModelProperty(value= "浠诲姟鏄庣粏")
private Long taskDetlId;
+ @ApiModelProperty("浠诲姟ID")
+ private Long taskId;
+
+ @ApiModelProperty("浠诲姟鍙�")
+ private String taskNo;
+
/**
* 鏁伴噺
*/
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
index f9adb77..e5d13a7 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
@@ -1153,28 +1153,30 @@
throw new CoolException("褰撳墠娉㈡璁㈠崟涓嶅瓨鍦紒锛�");
}
- List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>()
- .eq(CacheSite::getSiteStatus, CacheSiteStatusType.O.id).eq(CacheSite::getChannel, task.getTargetSite()));
+// List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>()
+// .eq(CacheSite::getSiteStatus, CacheSiteStatusType.O.id).eq(CacheSite::getChannel, task.getTargetSite()));
+//
+// if (cacheSites.isEmpty()) {
+// throw new CoolException("缂撳瓨绔欑┖闂翠笉瓒筹紝璇风◢鍚庡啀璇�");
+// }
+//
+// if (cacheSites.size() < orders.size()) {
+// throw new CoolException("缂撳瓨绔欑┖闂翠笉瓒筹紝璇风◢鍚庡啀璇�");
+// }
- if (cacheSites.isEmpty()) {
- throw new CoolException("缂撳瓨绔欑┖闂翠笉瓒筹紝璇风◢鍚庡啀璇�");
- }
-
- if (cacheSites.size() < orders.size()) {
- throw new CoolException("缂撳瓨绔欑┖闂翠笉瓒筹紝璇风◢鍚庡啀璇�");
- }
-
- for (int i = 0; i < orders.size(); i++) {
- CacheSite cacheSite = cacheSites.get(i);
- cacheSite.setOrderId(orders.get(i).getId());
- cacheSite.setOrderNo(orders.get(i).getOrderNo());
- cacheSite.setSiteStatus(CacheSiteStatusType.R.id);
- cacheSite.setBarcode(loc.getBarcode());
- cacheSite.setUpdateTime(new Date());
- if (!cacheSiteService.updateById(cacheSite)) {
- throw new CoolException("缂撳瓨绔欐洿鏂板け璐�");
- }
- }
+// for (int i = 0; i < orders.size(); i++) {
+// CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderId, orders.get(i).getId()));
+// if (Objects.isNull(cacheSite)) {
+// cacheSite.setOrderId(orders.get(i).getId());
+// cacheSite.setOrderNo(orders.get(i).getOrderNo());
+// cacheSite.setSiteStatus(CacheSiteStatusType.R.id);
+// cacheSite.setBarcode(loc.getBarcode());
+// cacheSite.setUpdateTime(new Date());
+// if (!cacheSiteService.updateById(cacheSite)) {
+// throw new CoolException("缂撳瓨绔欐洿鏂板け璐�");
+// }
+// }
+// }
//搴撲綅F => R
loc.setLocStsId(LocStsType.R.val());
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java
index fe022b1..0030ed9 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
import com.zy.asrs.wms.asrs.entity.WaveSeed;
+import com.zy.asrs.wms.asrs.entity.dto.ShippingOrderDetlDto;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
import java.util.List;
@@ -14,4 +15,6 @@
List<SowSeeds> selectSeedsList();
int removeSowById(Long id);
+
+ List<ShippingOrderDetlDto> selectShippingOrderDtel(String orderNo);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
index ba4967f..1adf5de 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
@@ -76,17 +76,15 @@
@Autowired
private OrderDetlMapper orderDetlMapper;
@Autowired
- private WaveSeedMapper waveSeedMapper;
+ private WaveSeedService waveSeedMapper;
@Autowired
private WaveSeedLogService waveSeedLogService;
@Autowired
private OrderDetlLogService orderDetlLogService;
-
@Autowired
private PlatformDetlService platformDetlService;
@Autowired
private PlatformDetlLogService platformDetlLogService;
-
@Override
@@ -427,15 +425,14 @@
.setOrderId(order.getId())
.setSiteStatus(CacheSiteStatusType.R.id)
.setBarcode(param.get("barcode").toString());
- if (cacheSiteMapper.updateById(siteNo) < 1) {
+ if (!cacheSiteService.saveOrUpdate(siteNo)) {
throw new CoolException("璁㈠崟鎾浣嶇粦瀹氬け璐ワ紒锛�" );
}
- int update = waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>()
+ if (!waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>()
.eq(WaveSeed::getOrderNo, order.getOrderNo())
.set(WaveSeed::getSiteId, siteNo.getId())
- .set(WaveSeed::getSiteNo, siteNo.getSiteNo()));
- if (update < 1) {
+ .set(WaveSeed::getSiteNo, siteNo.getSiteNo()))) {
throw new CoolException("鎾绔欑偣鏇存柊澶辫触锛侊紒");
}
} else {
@@ -524,7 +521,7 @@
}
}
- List<WaveSeed> waveSeeds = waveSeedMapper.selectList(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getOrderDetlId, order.getId()));
+ List<WaveSeed> waveSeeds = waveSeedMapper.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getOrderDetlId, order.getId()));
//fixme 璁㈠崟鏄庣粏鏈挱绉嶏紝榛樿鍙彂璐�
if (!waveSeeds.isEmpty()) {
ArrayList<WaveSeedLog> waveSeedLogs = new ArrayList<>();
@@ -537,11 +534,15 @@
if (!waveSeedLogService.saveBatch(waveSeedLogs)) {
throw new CoolException("娉㈡槑鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
}
+
+ List<Long> list = waveSeeds.stream().map(WaveSeed::getId).collect(Collectors.toList());
+ //鍒犻櫎鎾鏄庣粏淇℃伅
+ if (!waveSeedMapper.removeByIds(list)) {
+ throw new CoolException("鎾鏄庣粏鍒犻櫎鎼虹▼锛侊紒");
+ }
+
}
- //鍒犻櫎鎾鏄庣粏淇℃伅
- if (waveSeedMapper.deleteByIds(waveSeeds) < 1) {
- throw new CoolException("鎾鏄庣粏鍒犻櫎鎼虹▼锛侊紒");
- }
+
});
orderList.forEach(one -> {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
index 7ebbbf9..d9a19eb 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
@@ -5,6 +5,7 @@
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
import com.zy.asrs.wms.asrs.entity.*;
+import com.zy.asrs.wms.asrs.entity.dto.ShippingOrderDetlDto;
import com.zy.asrs.wms.asrs.entity.enums.OrderPickStatus;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
import com.zy.asrs.wms.asrs.mapper.*;
@@ -16,10 +17,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
import java.util.stream.Collectors;
@Service("waveSeedService")
@@ -134,4 +132,9 @@
public int removeSowById(Long id) {
return this.baseMapper.update(new LambdaUpdateWrapper<WaveSeed>().eq(WaveSeed::getId, id).set(WaveSeed::getDeleted, 1).set(WaveSeed::getStatus, 0));
}
+
+ @Override
+ public List<ShippingOrderDetlDto> selectShippingOrderDtel(String orderNo) {
+ return this.baseMapper.selectShippingOrderDtel(orderNo);
+ }
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
index 08172a0..656ca8f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
@@ -210,6 +210,8 @@
waveSeed.setOrderNo(orderDetl.getOrderNo());
waveSeed.setOrderId(orderDetl.getOrderId());
waveSeed.setOrderDetlId(orderDetl.getId());
+ waveSeed.setTaskId(taskDetl.getTaskId());
+ waveSeed.setTaskNo(taskDetl.getTaskNo());
waveSeed.setWaveId(taskDetl.getWaveId()).setWaveNo(taskDetl.getWaveNo());
waveSeed.setTaskDetlId(taskDetl.getId());
//涓烘弧瓒冲綋鍓嶉渶姹傦紝缁忕‘璁わ紝鏀规垚璁㈠崟鏁伴噺
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
index 450cdf0..545740d 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
@@ -13,7 +13,7 @@
</foreach>
</select>
<select id="getTaskDetlByTaskNo" resultType="com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl">
- SELECT mt.task_no,mtd.matnr, mtd.anfme ,mtd.wave_no, mtd.stock, mtd.batch FROM man_task mt INNER JOIN
+ SELECT mt.task_no,mtd.matnr, mtd.anfme ,mtd.wave_no, mt.site_no, mtd.stock, mtd.batch FROM man_task mt INNER JOIN
man_task_detl mtd ON mt.id = mtd.task_id
WHERE 1 = 1
<if test="taskNo != null and taskNo != ''">
@@ -22,33 +22,31 @@
</select>
<select id="getTaskDetlQutify" resultType="com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl">
SELECT
- *
+ t.*
FROM
(
SELECT
- mws.id,
- mws.matnr,
- mws.order_no,
- mws.order_id,
- SUM( mws.anfme ) anfme,
- mws.wave_no,
- SUM( mws.work_qty ) work_qty,
- mws.batch,
- mws.task_detl_id,
- mcs.site_no
+ mws.id,
+ mws.matnr,
+ mws.order_no,
+ mws.order_id,
+ SUM( mws.anfme ) anfme,
+ mws.wave_no,
+ SUM( mws.work_qty ) work_qty,
+ mws.batch,
+ mws.site_no,
+ mws.task_detl_id
FROM
- man_wave_seed mws LEFT JOIN man_cache_site mcs ON mws.order_id = mcs.order_id
- WHERE
- task_detl_id IN ( SELECT mtd.id FROM man_task mt INNER JOIN man_task_detl mtd ON mt.id = mtd.task_id
- <if test="taskNo != null and taskNo != ''">
- AND mt.task_no = #{taskNo}
- </if>
+ man_wave_seed mws
+ WHERE
+ task_detl_id IN ( SELECT mtd.id FROM man_task mt INNER JOIN man_task_detl mtd ON mt.id = mtd.task_id
+ <if test="taskNo != null and taskNo != ''">
+ AND mt.task_no = #{taskNo}
+ </if>
)
- <if test="waveNo != null and waveNo != ''">
- AND mws.wave_no = #{waveNo}
- </if>
- GROUP BY
- order_no, matnr
+ GROUP BY
+ order_no,
+ matnr
) t
</select>
<select id="getTaskIntegrateByTaskNo" resultType="com.zy.asrs.wms.asrs.entity.dto.LargeScreenTaskDto">
--
Gitblit v1.9.1