From 645da5e4e48dd94b760ea4dcbf80e22bf2a3f33c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 11 一月 2025 17:20:08 +0800
Subject: [PATCH] #添加播种站点功能
---
zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml | 46 +++++++---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/User.java | 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskServiceImpl.java | 12 ---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java | 40 ++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TaskMapper.java | 7 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/MobileService.java | 10 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 19 ++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java | 20 ++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java | 16 ++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/LargeScreenTaskDto.java | 36 +++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskService.java | 3
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/CacheSiteMapper.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java | 1
zy-asrs-wms/src/main/resources/mapper/asrs/CacheSiteMapper.xml | 1
16 files changed, 171 insertions(+), 49 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
index ecc1633..a79aad7 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
@@ -1,6 +1,8 @@
package com.zy.asrs.wms.apis.wcs.controller;
+import com.mysql.cj.util.StringUtils;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
import com.zy.asrs.wms.system.controller.BaseController;
@@ -8,6 +10,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.Map;
+import java.util.Objects;
@RestController
@RequestMapping("/wave")
@@ -33,16 +36,29 @@
*/
@GetMapping("/sow/task/detl/{taskNo}")
public R getTaskDetl(@PathVariable String taskNo) {
+ if (StringUtils.isNullOrEmpty(taskNo)) {
+ throw new CoolException("浠诲姟缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
return waveManagentService.getTaskDetl(taskNo);
}
+
@PostMapping("/task/detl/qutify")
public R getTaskDetlQutify(@RequestBody Map<String, Object> param) {
- return waveManagentService.getTaskDetlQutify(param);
+ if (Objects.isNull(param)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(param.get("taskNo"))) {
+ throw new CoolException("璇锋眰鍙傛暟锛氫换鍔＄紪鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ String taskNoStr = (String) param.get("taskNo");
+// Long matnr = Long.valueOf(taskNo.get("matnr").toString());
+
+ return waveManagentService.getTaskDetlQutify(taskNoStr);
}
/***
- * 鑾峰彇鍑哄簱鍒楄〃
+ * 澶у睆鑾峰彇鍑哄簱鍒楄〃
* @return
*/
@GetMapping("/sow/tasks")
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java
index f63a859..9113fb2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java
@@ -34,7 +34,7 @@
*/
private String orderNo;
/**
- * 鎵ц涓暟閲�
+ * 宸叉嫞璐ф暟閲�
*/
private Integer workQty;
/**
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
index 5e520c8..17653bd 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
@@ -7,15 +7,16 @@
import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
import com.zy.asrs.wms.asrs.entity.Task;
+import com.zy.asrs.wms.asrs.entity.dto.LargeScreenTaskDto;
import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
+import com.zy.asrs.wms.asrs.mapper.TaskMapper;
import com.zy.asrs.wms.asrs.service.TaskService;
import com.zy.asrs.wms.asrs.service.WaveSeedService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
-import java.util.Map;
@Service
public class WaveManagentServiceImpl implements WaveManagentService {
@@ -24,6 +25,9 @@
@Autowired
private TaskService taskService;
+
+ @Autowired
+ private TaskMapper taskMapper;
@Override
public R getSowSeeds() {
@@ -48,13 +52,13 @@
@Override
public R getTask() {
- List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id));
- return R.ok(list);
+ List<LargeScreenTaskDto> taskDtos = taskMapper.getTaskIntegrateByTaskNo(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id));
+ return R.ok(taskDtos);
}
@Override
public R getTaskDetl(String taskNo) {
- List<WaveTaskDetl> taskDetls = taskService.getTaskDetlByTaskNo(taskNo);
+ List<WaveTaskDetl> taskDetls = taskMapper.getTaskDetlByTaskNo(taskNo);
return R.ok(taskDetls);
}
@@ -64,8 +68,8 @@
* @return
*/
@Override
- public R getTaskDetlQutify(Map<String, Object> taskNo) {
- List<WaveTaskDetl> taskDetls = taskService.getTaskDetlQutify(taskNo);
+ public R getTaskDetlQutify(String taskNo) {
+ List<WaveTaskDetl> taskDetls = taskMapper.getTaskDetlQutify(taskNo);
return R.ok(taskDetls);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
index b438421..1ad71e5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
@@ -4,8 +4,6 @@
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
-import java.util.Map;
-
public interface WaveManagentService {
R getSowSeeds();
@@ -17,5 +15,5 @@
R getTaskDetl(String taskNo);
- R getTaskDetlQutify(Map<String, Object> taskNo);
+ R getTaskDetlQutify(String taskNo);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
index 00bfa11..2e8116c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
@@ -9,6 +9,8 @@
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.asrs.entity.CacheSite;
import com.zy.asrs.wms.asrs.entity.Loc;
import com.zy.asrs.wms.asrs.entity.Order;
import com.zy.asrs.wms.asrs.entity.WaitPakin;
@@ -215,6 +217,44 @@
}
+ /**
+ * 鑾峰彇鎾浣�
+ * @return
+ */
+ @GetMapping("/pick/seed/locs")
+ public R seedLocs() {
+ List<CacheSite> sites = mobileService.getSeedLocs();
+ return R.ok(sites);
+ }
+ /**
+ * 璁㈠崟缁戝畾绔欑偣
+ * @param param
+ * @return
+ */
+ @PostMapping("/pick/seed/bind")
+ public R bindLoc(@RequestBody Map<String, Object> param) {
+ if (Objects.isNull(param)) {
+ throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(param.get("barcode"))) {
+ throw new CoolException("瀹瑰櫒缂栫爜涓嶈兘涓虹┖");
+ }
+ if (Objects.isNull(param.get("orderNo"))) {
+ throw new CoolException("璁㈠崟缂栧彿涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(param.get("siteNo"))) {
+ throw new CoolException("鎾绔欑偣涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(param.get("type"))) {
+ throw new CoolException("鍙傛暟绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+ boolean result = mobileService.bindOrderBySite(param);
+ if (result) {
+ return R.ok("缁戝畾鎴愬姛锛侊紒");
+ } else {
+ return R.error("缁戝畾澶辫触锛侊紒");
+ }
+ }
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/LargeScreenTaskDto.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/LargeScreenTaskDto.java
new file mode 100644
index 0000000..46d1613
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/LargeScreenTaskDto.java
@@ -0,0 +1,36 @@
+package com.zy.asrs.wms.asrs.entity.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+public class LargeScreenTaskDto implements Serializable {
+
+ /**
+ * 鏁伴噺
+ */
+ private Double anfme;
+ /**
+ * 娉㈡
+ */
+ private String waveNo;
+
+ private Long id;
+ /**
+ * 鎷栫洏鐮�
+ */
+ private String barcode;
+ /**
+ * 浠诲姟缂栫爜
+ */
+ private String taskNo;
+ /**
+ * 浠诲姟鐘舵��
+ */
+ private Integer taskSts;
+
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/CacheSiteMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/CacheSiteMapper.java
index 55e989b..10ac1c0 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/CacheSiteMapper.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/CacheSiteMapper.java
@@ -3,9 +3,11 @@
import com.zy.asrs.wms.asrs.entity.CacheSite;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
+import java.util.Map;
@Mapper
@Repository
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TaskMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TaskMapper.java
index 2d25099..8dbf9ed 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TaskMapper.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TaskMapper.java
@@ -1,8 +1,11 @@
package com.zy.asrs.wms.asrs.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl;
import com.zy.asrs.wms.asrs.entity.Task;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zy.asrs.wms.asrs.entity.dto.LargeScreenTaskDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -17,5 +20,7 @@
List<WaveTaskDetl> getTaskDetlByTaskNo(@Param("taskNo") String taskNo);
- List<WaveTaskDetl> getTaskDetlQutify(@Param("taskNo") String taskNo,@Param("matnr") Long matnr);
+ List<WaveTaskDetl> getTaskDetlQutify(@Param("taskNo") String taskNo);
+
+ List<LargeScreenTaskDto> getTaskIntegrateByTaskNo(@Param(Constants.WRAPPER) LambdaQueryWrapper<Task> ew);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/MobileService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/MobileService.java
index 6b9ac89..be44752 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/MobileService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/MobileService.java
@@ -1,15 +1,13 @@
package com.zy.asrs.wms.asrs.service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zy.asrs.wms.asrs.entity.Loc;
-import com.zy.asrs.wms.asrs.entity.PickSheet;
+import com.zy.asrs.wms.asrs.entity.CacheSite;
import com.zy.asrs.wms.asrs.entity.dto.PickSheetDetlDto;
import com.zy.asrs.wms.asrs.entity.param.BatchMergeOrdersParam;
-import com.zy.asrs.wms.asrs.entity.param.PageRequest;
import com.zy.asrs.wms.asrs.entity.param.PakinOnShelvesParams;
import com.zy.asrs.wms.system.entity.Host;
import java.util.List;
+import java.util.Map;
public interface MobileService {
@@ -23,4 +21,8 @@
PickSheetDetlDto outFlatSheet(String code);
boolean confirmFlatSheet(String code);
+
+ List<CacheSite> getSeedLocs();
+
+ boolean bindOrderBySite(Map<String, Object> param);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskService.java
index e37ec1a..f976fa2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskService.java
@@ -13,7 +13,4 @@
List<Task> selectWaitWaveOut(List<Long> waveIds);//鑾峰彇绛夊緟娉㈡鍑哄簱鐨勪换鍔ist
- List<WaveTaskDetl> getTaskDetlByTaskNo(String taskNo);
-
- List<WaveTaskDetl> getTaskDetlQutify(Map<String, Object> taskNo);
}
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 e0194db..77f09a9 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
@@ -13,6 +13,7 @@
import com.zy.asrs.wms.asrs.entity.param.GeneratePakInParam;
import com.zy.asrs.wms.asrs.entity.param.PageRequest;
import com.zy.asrs.wms.asrs.entity.param.PakinOnShelvesParams;
+import com.zy.asrs.wms.asrs.mapper.CacheSiteMapper;
import com.zy.asrs.wms.asrs.service.*;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.service.HostService;
@@ -60,6 +61,8 @@
private WaveService waveService;
@Autowired
private WaveDetlService waveDetlService;
+ @Autowired
+ private CacheSiteMapper cacheSiteMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -301,4 +304,20 @@
return true;
}
+ @Override
+ public List<CacheSite> getSeedLocs() {
+ return cacheSiteMapper.selectList(new LambdaQueryWrapper<>());
+ }
+
+ /**
+ * 璁㈠崟缁戝畾鎾澧�
+ * @param param
+ * @return
+ */
+ @Override
+ public boolean bindOrderBySite(Map<String, Object> param) {
+// return cacheSiteMapper.bindOrderBySite(param);
+ return false;
+ }
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskServiceImpl.java
index 0e8f367..6b83f16 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskServiceImpl.java
@@ -35,17 +35,5 @@
return this.baseMapper.selectWaitWaveOut(waveIds);
}
- @Override
- public List<WaveTaskDetl> getTaskDetlByTaskNo(String taskNo) {
- return this.baseMapper.getTaskDetlByTaskNo(taskNo);
- }
-
- @Override
- public List<WaveTaskDetl> getTaskDetlQutify(Map<String, Object> taskNo) {
- String taskNoStr = (String) taskNo.get("taskNo");
- Long matnr = Long.valueOf(taskNo.get("matnr").toString());
- return this.baseMapper.getTaskDetlQutify(taskNoStr, matnr);
- }
-
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
index 71506f9..b3a784b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
@@ -6,7 +6,6 @@
import com.zy.asrs.wms.system.service.UserLoginService;
import com.zy.asrs.wms.system.service.UserRoleService;
import com.zy.asrs.wms.system.service.UserService;
-import net.sf.jsqlparser.expression.LongValue;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/User.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/User.java
index e325f39..432ee5d 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/User.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/User.java
@@ -8,7 +8,6 @@
import com.zy.asrs.wms.system.service.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import net.sf.jsqlparser.expression.LongValue;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.security.core.userdetails.UserDetails;
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/CacheSiteMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/CacheSiteMapper.xml
index e393d91..35eed04 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/CacheSiteMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/CacheSiteMapper.xml
@@ -2,6 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.wms.asrs.mapper.CacheSiteMapper">
+
<select id="getChannelList" resultType="string">
select distinct channel from man_cache_site
</select>
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 1c278d0..5db1164 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
@@ -21,21 +21,37 @@
</if>
</select>
<select id="getTaskDetlQutify" resultType="com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl">
- SELECT
- id,matnr,order_no, anfme ,wave_no, work_qty, batch
- FROM
- man_wave_seed
- WHERE
- task_detl_id IN ( SELECT mtd.id 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 != ''">
- AND mt.task_no = #{taskNo}
- </if>
- )
- <if test="matnr != null and matnr != ''">
- AND matnr = #{matnr}
- </if>
-
+ SELECT * FROM (
+ SELECT
+ id,matnr,order_no, SUM(anfme) anfme ,wave_no, SUM(work_qty) work_qty, batch, task_detl_id
+ FROM
+ man_wave_seed
+ 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>
+ ) GROUP BY order_no, matnr
+ ) t
+ </select>
+ <select id="getTaskIntegrateByTaskNo" resultType="com.zy.asrs.wms.asrs.entity.dto.LargeScreenTaskDto">
+ SELECT * FROM
+ (
+ SELECT
+ mt.task_no,
+ mt.barcode,
+ mtd.wave_no,
+ SUM( mtd.anfme ) anfme,
+ mt.id,
+ mt.task_sts
+ FROM
+ man_task mt
+ INNER JOIN man_task_detl mtd ON mt.id = mtd.task_id
+ GROUP BY
+ mt.task_no,
+ mtd.wave_no
+ ) t
+ ${ew.customSqlSegment}
</select>
</mapper>
--
Gitblit v1.9.1