From 19fe6936cbe4deef1f18186350a71acff4dff58e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 14 一月 2025 17:06:18 +0800
Subject: [PATCH] # 24. PDA出库成功后，界面数据重置，避免重复操作 （已修复） 25. PDA接口请求，添加一个Loading遮档 （已修复） 27. 非平库单据，在平库可做入库操作 （已修复） 29. 平库入库后，订单明细没有添加（已修复） 30. 平库入库后，单据类型没有修改（已修复） 31. 没有绑定播种位，不能进行播种，前后端都需加判定（已修复） 33. 平库入库未修改入库已完成数量（已修复）
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java | 24 +++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/response/RfidResponse.java | 49 ++++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java | 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java | 30 +------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 34 ++++++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java | 22 +++--
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/request/RfidSingalRequest.java | 48 ++++++++++++
9 files changed, 168 insertions(+), 44 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 ce2cf7c..8afbd6b 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
@@ -3,6 +3,8 @@
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.entity.request.RfidSingalRequest;
+import com.zy.asrs.wms.apis.wcs.entity.response.CommonReponse;
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;
@@ -12,6 +14,9 @@
import java.util.Map;
import java.util.Objects;
+/**
+ * 澶у睆鎿嶄綔鍩烘湰鍔熻兘
+ */
@RestController
@RequestMapping("/wave")
public class WaveManagentController extends BaseController {
@@ -45,6 +50,7 @@
/**
* 澶у睆鑾峰彇浠诲姟鏄庣粏
+ * 鑾峰彇褰撳墠鎾涓叿浣撲换鍔℃槑缁�
* @param param
* @return
*/
@@ -73,6 +79,7 @@
/***
* 澶у睆鑾峰彇鍑哄簱鍒楄〃
+ * 鑾峰彇褰撳墠鎾涓墽琛屾暟鎹�
* @return
*/
@GetMapping("/sow/tasks")
@@ -81,7 +88,8 @@
}
/**
- * 瀹℃牳鎾鐘舵�佷换鍔�
+ * 娉㈡鎾
+ * 鎾鏄庣粏鏁伴噺淇敼
* @param reviewParam
* @return
*/
@@ -126,4 +134,18 @@
return waveManagentService.getAllOrders(waveNo);
}
+
+ /**
+ * 淇″彿鍥炰紶鎺ュ彛锛屽洖浼犵數瀛愭爣绛剧姸鎬佸彉鍖栧唴瀹圭粰涓婃父绯荤粺銆�
+ * 褰撲汉涓烘搷浣滐紙姣斿鎷嶇伅锛屾洿鏀规暟瀛楋紝鏀剧绛夛級瀵艰嚧鐢靛瓙鏍囩鐨勭姸鎬佸拰淇″彿绛夊彂鐢熷彉鍖栥�佹垨璁惧鏈韩鍙戠敓寮傚父鏃讹紝ESS鎺ユ敹鍒颁俊鍙峰悗锛岄�氳繃璇ユ帴鍙ｅ皢淇″彿鍥炰紶缁欎笂娓哥郴缁熴��
+ * @param request
+ * @return
+ */
+ @PostMapping("/")
+ public R rfidCallback(@RequestBody RfidSingalRequest request) {
+
+ return R.ok();
+ }
+
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/request/RfidSingalRequest.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/request/RfidSingalRequest.java
new file mode 100644
index 0000000..13bb11b
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/request/RfidSingalRequest.java
@@ -0,0 +1,48 @@
+package com.zy.asrs.wms.apis.wcs.entity.request;
+
+import io.swagger.models.auth.In;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+public class RfidSingalRequest implements Serializable {
+
+ /**
+ * 浜嬩欢鍚嶇О锛�
+ * 飦琇IGHT_OFF锛氱伃鐏��
+ * 飦珼ISPLAY_CHANGE锛氭樉绀烘暟瀛楃殑鍙樺寲銆�
+ * 飦琓AG_ABNORMAL锛氱數瀛愭爣绛惧紓甯搞��
+ * SIGNAL锛氬厜鐢典俊鍙枫��
+ */
+ private String eventCode;
+ /**
+ * 鎺у埗鍣╟ode锛岄渶瑕佷笌鎺у埗鍣ㄩ厤缃畃tlController閲宑ode瀵瑰簲銆�
+ */
+ private String controllerCode;
+ /**
+ * 鐢靛瓙鏍囩缂栧彿锛岄渶瑕佷笌鐢靛瓙鏍囩ptlTag閲岀殑 code瀵瑰簲銆�
+ */
+ private String tagCode;
+ /**
+ * 鏄剧ず淇℃伅锛屾暟閲忔敼鍙樻椂鍥炰紶銆�
+ */
+ private String display;
+ /**
+ * 鐢靛瓙鏍囩鐘舵�侊細
+ * 飦�0锛氫綔涓氬畬鎴愩��
+ * 飦�1锛氱數瀛愭爣绛惧紓甯搞��
+ * 飦�2锛氫綔涓氬彇娑堛��
+ * 飦�3锛氬懡浠ら敊璇��
+ * 4锛氳繛鎺ュけ璐�
+ */
+ private Integer status;
+ /**
+ * 鏄惁鏈夌瀛愮殑淇″彿锛�
+ * 飦�1锛氭湁绠便��
+ * 2锛氭棤绠便��
+ */
+ private Integer signal;
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/response/RfidResponse.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/response/RfidResponse.java
new file mode 100644
index 0000000..dee377b
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/response/RfidResponse.java
@@ -0,0 +1,49 @@
+package com.zy.asrs.wms.apis.wcs.entity.response;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+public class RfidResponse implements Serializable {
+ //http://{IP:PORT}/expand/api/equipment/ptl/sendCommand
+
+ /**
+ * 鎺у埗鍣╟ode锛岄渶瑕佷笌鎺у埗鍣ㄩ厤缃畃tlController閲岀殑code瀵瑰簲銆�
+ */
+ private String controllerCode;
+
+ /**
+ * 鐢靛瓙鏍囩搴忓彿锛岄渶瑕佷笌鐢靛瓙鏍囩ptlTag閲岀殑index瀵瑰簲銆�
+ */
+ private String index;
+
+ /**
+ * 鐢靛瓙鏍囩缂栧彿锛岄渶瑕佷笌鐢靛瓙鏍囩ptlTag閲岀殑code瀵瑰簲銆�
+ */
+ private String tagCode;
+
+ /**
+ * 棰滆壊锛�
+ * 飦琑ED
+ * 飦珿REEN
+ * BLUE
+ */
+ private String color;
+
+ /**
+ * 宸ヤ綔妯″紡锛�
+ * 飦琇IGHT锛氫寒鐏�
+ * 飦珼ARK锛氱伃鐏�
+ * FLASH锛氶棯鐏�
+ */
+ private String mode;
+
+ /**
+ * 甯哥敤浜庢樉绀烘暟瀛楋紝鏀寔3浣嶆暟銆�
+ */
+ private String display;
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
index 3e21860..7fe3bc7 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
@@ -150,6 +150,7 @@
/**
+ * //fixme 寮冪敤
* 鍑哄簱浠诲姟---閫氱煡瀹瑰櫒娴佸姩
* 姣忛殧3绉掞紝鑾峰彇褰撳墠鍑哄簱浠诲姟鍒楄〃鐘舵�佷负COMPLETE_OUT鐨勪换鍔★紝骞堕�氱煡ESS娴佸姩杈撻�佺嚎
*/
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 2a97b80..e5e77a4 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
@@ -995,7 +995,7 @@
}
/**
- * 鏍规嵁涓嶅悓搴撲綅绫诲瀷鐢熸垚鍑哄簱鎷ｅ崟鍙奣UC浠诲姟妗�
+ * 鏍规嵁涓嶅悓搴撲綅绫诲瀷鐢熸垚鍑哄簱鎷ｅ崟鍙奀TU浠诲姟妗�
*
* @param dto
* @param wave
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 d84ddd1..965c041 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
@@ -11,6 +11,7 @@
import com.zy.asrs.wms.asrs.entity.param.GeneratePakInParam;
import com.zy.asrs.wms.asrs.entity.param.PakinOnShelvesParams;
import com.zy.asrs.wms.asrs.mapper.CacheSiteMapper;
+import com.zy.asrs.wms.asrs.mapper.OrderDetlLogMapper;
import com.zy.asrs.wms.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.wms.asrs.mapper.SeedSitesMapper;
import com.zy.asrs.wms.asrs.service.*;
@@ -69,6 +70,9 @@
@Autowired
private OrderDetlMapper orderDetlMapper;
+ @Autowired
+ private OrderDetlLogService orderDetlLogService;
+
@Override
@Transactional(rollbackFor = Exception.class)
public boolean batchMergeOrders(BatchMergeOrdersParam ordersParam) {
@@ -107,8 +111,6 @@
if (workService.generatePakIn(generatePakInParam)) {
return true;
}
- } else {
- //fixme 骞冲簱鏄惁闇�瑕侀绾﹀叆搴�
}
return false;
}
@@ -183,6 +185,7 @@
waitPakins.forEach(waitPakin -> {
WaitPakinLog pakinLog = new WaitPakinLog();
BeanUtils.copyProperties(waitPakin, pakinLog);
+ pakinLog.setIoStatus(1);
if (!waitPakinLogService.saveOrUpdate(pakinLog)) {
throw new CoolException("缁勬嫋鍘嗗彶妗ｆ洿鏂板け璐�");
}
@@ -199,6 +202,9 @@
if (order.getOrderType() != OrderType.PK_IN_ORDER.id) {
throw new CoolException("褰撳墠璁㈠崟绫诲瀷:" + order.getOrderType() + ",涓嶅彲鍋氬钩搴撲笂鏋舵搷浣滐紒锛�");
}
+ //淇敼璁㈠崟鐘舵�佷负宸插畬鎴�
+ order.setOrderSettle(OrderSettleType.COMPLETE.val());
+
OrderLog orderLog = new OrderLog();
BeanUtils.copyProperties(order, orderLog);
if (!orderLogService.save(orderLog)) {
@@ -210,10 +216,24 @@
if (!orderService.removeBatchByIds(orders)) {
throw new CoolException("璁㈠崟鍒犻櫎澶辫触锛侊紒");
}
-// //鍒犻櫎璁㈠崟鏄庣粏鏁版嵁
-// if (orderDetlMapper.delete(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, list)) < 1) {
-// throw new CoolException("璁㈠崟鏄庣粏鍒犻櫎澶辫触锛侊紒");
-// }
+
+ List<OrderDetl> detls = orderDetlMapper.selectList(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, list));
+ List<OrderDetlLog> detlLogs = new ArrayList<>();
+ detls.forEach(delt ->{
+ OrderDetlLog detlLog = new OrderDetlLog();
+ BeanUtils.copyProperties(delt, detlLog);
+ detlLogs.add(detlLog);
+ });
+
+ //璁㈠崟鏄庣粏杞巻鍙叉。
+ if (!orderDetlLogService.saveBatch(detlLogs)) {
+ throw new CoolException("璁㈠崟鏄庣粏杞巻鍙插け璐ワ紒锛�");
+ }
+
+ //鍒犻櫎璁㈠崟鏄庣粏鏁版嵁
+ if (!orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, list))) {
+ throw new CoolException("璁㈠崟鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ }
return true;
}
@@ -317,7 +337,7 @@
if (!remove) {
throw new CoolException("鍘熷璁㈠崟鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
- if (orderService.remove(new LambdaQueryWrapper<Order>().in(Order::getId, list))) {
+ if (!orderService.remove(new LambdaQueryWrapper<Order>().in(Order::getId, list))) {
throw new CoolException("鍘熷璁㈠崟鍒犻櫎澶辫触锛侊紒");
}
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 b7dec62..1a98667 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
@@ -4,15 +4,9 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
-import com.zy.asrs.wms.asrs.entity.Order;
-import com.zy.asrs.wms.asrs.entity.OrderDetl;
-import com.zy.asrs.wms.asrs.entity.TaskDetl;
+import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
-import com.zy.asrs.wms.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.wms.asrs.mapper.OrderMapper;
-import com.zy.asrs.wms.asrs.mapper.TaskDetlMapper;
-import com.zy.asrs.wms.asrs.mapper.WaveSeedMapper;
-import com.zy.asrs.wms.asrs.entity.WaveSeed;
+import com.zy.asrs.wms.asrs.mapper.*;
import com.zy.asrs.wms.asrs.service.OrderDetlService;
import com.zy.asrs.wms.asrs.service.WaveSeedService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -35,6 +29,9 @@
private OrderDetlMapper orderDetlMapper;
@Autowired
private TaskDetlMapper taskDetlMapper;
+
+ @Autowired
+ private CacheSiteMapper cacheSiteMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -60,7 +57,10 @@
throw new CoolException("鎾鏁版嵁涓嶅瓨鍦�");
}
-
+ List<CacheSite> sites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, waveSeed.getOrderNo()));
+ if (sites.isEmpty()) {
+ throw new CoolException("褰撳墠璁㈠崟鏈粦瀹氭挱绉嶅簱浣嶏紝璇风粦瀹氬悗鍐嶆搷浣滐紒锛�");
+ }
Double stock = Optional.of(waveSeed.getAnfme() - waveSeed.getWorkQty()).orElse(0.0D);
if (stock - param.getReviewNum() < 0) {
@@ -81,6 +81,9 @@
throw new CoolException("褰撳墠鎾璁㈠崟鏄庣粏涓嶅瓨鍦紒锛�");
}
orderDetl.setWorkQty(orderDetl.getWorkQty() + param.getReviewNum());
+ if (orderDetl.getWorkQty() + orderDetl.getQty() > orderDetl.getAnfme()) {
+ throw new CoolException("璇锋牳瀵规槑缁嗘暟閲忓悗锛屽啀杩涜鎿嶄綔!!");
+ }
if (orderDetlMapper.updateById(orderDetl) < 1) {
throw new CoolException("璁㈠崟鏄庣粏鏁伴噺鏇存柊澶辫触");
}
@@ -89,7 +92,6 @@
if (!this.updateById(waveSeed)) {
throw new CoolException("鎾澶嶆牳鏇存柊澶辫触");
}
-
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
index 0091d2c..dd8259a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
@@ -226,7 +226,7 @@
return defaultLoc;
}
}
- //fixme 濡傛灉娌℃湁鐩搁偦搴撲綅鏄惁鑰冭檻鎺ㄨ崘搴撲綅
+
if (ruleDetl.getDetlType().equals(ShelvesRuleDetlType.SUGGEST.id)) {
//鑾峰彇鎺ㄨ崘搴撲綅
List<Loc> suggestLoc = locUtils.getSuggestLoc(taskType, mat.getId(), batch, locTypeHeight, laneRowList, currentLev);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
index 0d6e371..066aa6b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
@@ -155,19 +155,6 @@
task.setTaskSts(TaskStsType.UPDATED_OUT.id);//200.搴撳瓨鏇存柊瀹屾垚
if (!taskService.updateById(task)) {
throw new CoolException("搴撳瓨鏇存柊澶辫触");
- } else {
- //CacheSite 閲婃斁宸茶鍗犵敤鐨勯�氶亾 //fixme 鎾鍔熻兘瀹屾垚鍚庯紝闇�瑕佸皢杩欓噷娉ㄩ噴鎺�
-// List<TaskDetl> detls = taskDetlService.list(new LambdaQueryWrapper<TaskDetl>().eq(TaskDetl::getTaskId, task.getId()));
-// if (!Collections.isEmpty(detls)) {
-// List<Long> waveIds = detls.stream().map(TaskDetl::getWaveId).collect(Collectors.toList());
-// List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getWaveId, waveIds));
-// List<Long> orderIds = orders.stream().map(Order::getId).collect(Collectors.toList());
-// cacheSiteService.update(new LambdaUpdateWrapper<CacheSite>()
-// .in(CacheSite::getOrderId, orderIds)
-// .set(CacheSite::getSiteStatus, 0)
-// .set(CacheSite::getOrderId, null)
-// .set(CacheSite::getOrderNo, null));
-// }
}
}
} catch (Exception e) {
@@ -216,10 +203,9 @@
if (!locDetlService.save(locDetl)) {
throw new CoolException("鎻掑叆搴撳瓨鏄庣粏澶辫触");
}
- //fixme 鏆傛椂鍏抽棴HOSTID,鍚庣画鎵撳紑鏈烘瀯ID
+
//娣诲姞搴撳瓨鏄庣粏鎵╁睍瀛楁
-// List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()).eq(TaskDetlField::getHostId, hostId));
- List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()));
+ List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()).eq(TaskDetlField::getHostId, hostId));
for (TaskDetlField detlField : detlFields) {
LocDetlField locDetlField = new LocDetlField();
locDetlField.setDetlId(locDetl.getId());
@@ -232,10 +218,8 @@
}
}
}
- //fixme 鏆傛椂鍏抽棴HOSTID,鍚庣画鎵撳紑鏈烘瀯ID
//缁勬墭閫氱煡妗ｈ浆鍘嗗彶妗�
-// List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, task.getBarcode()).eq(WaitPakin::getHostId, hostId));
- List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, task.getBarcode()));
+ List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, task.getBarcode()).eq(WaitPakin::getHostId, hostId));
if (waitPakins.isEmpty()) {
throw new CoolException("缁勬墭閫氱煡妗ｄ笉瀛樺湪");
}
@@ -342,8 +326,8 @@
private void executeTask53(Task task) {
Long hostId = task.getHostId();
//fixme 灏嗕换鍔″綋鍓�
-// Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()).eq(Loc::getHostId, hostId));
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()));
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()).eq(Loc::getHostId, hostId));
+// Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()));
if (loc == null) {
throw new CoolException("搴撲綅涓嶅瓨鍦�");
}
@@ -385,9 +369,7 @@
}
//娣诲姞搴撳瓨鏄庣粏鎵╁睍瀛楁
- //fixme 娉ㄩ噴
-// List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()).eq(TaskDetlField::getHostId, hostId));
- List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()));
+ List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()).eq(TaskDetlField::getHostId, hostId));
for (TaskDetlField detlField : detlFields) {
LocDetlField locDetlField = new LocDetlField();
locDetlField.setDetlId(locDetl.getId());
--
Gitblit v1.9.1