From fd8c8f8facc58ce1d2dd45b738e8316172c99a85 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 01 四月 2025 12:53:01 +0800
Subject: [PATCH] 1. 质检明细接口修改 2. 任务列表生成修改
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 923f464..ea755fb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -14,12 +14,10 @@
import com.vincent.rsf.server.common.security.JwtSubject;
import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.JwtUtil;
+import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.mapper.*;
-import com.vincent.rsf.server.manager.service.AsnOrderItemLogService;
-import com.vincent.rsf.server.manager.service.AsnOrderLogService;
-import com.vincent.rsf.server.manager.service.WarehouseAreasItemService;
-import com.vincent.rsf.server.manager.service.WarehouseAreasService;
+import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.constant.CodeRes;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.param.LoginParam;
@@ -87,6 +85,12 @@
@Autowired
private AsnOrderLogService asnOrderLogService;
+
+ @Autowired
+ private WaitPakinService waitPakinService;
+
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
@Autowired
private AsnOrderItemLogService asnOrderItemLogService;
@@ -212,6 +216,9 @@
.eq(AsnOrderItem::getMatnrId, dto.getMatnrId()));
if (Objects.isNull(orderItem)) {
throw new CoolException("閫氱煡鍗曟槑缁嗕笉瀛樺湪锛侊紒");
+ }
+ if (Objects.isNull(dto.getReceiptQty()) || Double.compare(dto.getReceiptQty(), 0.0) == 0) {
+ throw new CoolException("鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒");
}
orderItem.setQty(dto.getReceiptQty())
.setProdTime(dto.getProdTime());
@@ -391,6 +398,28 @@
return fieldsMapper.selectList(new LambdaQueryWrapper<Fields>().eq(Fields::getFlagEnable, 1).eq(Fields::getStatus, 1));
}
+ @Override
+ public R getDeltByCode(String code) {
+ return R.ok(asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, code)));
+ }
+
+ /**
+ * @author Ryan
+ * @description PDA缁勬嫋
+ * @param
+ * @return
+ * @time 2025/3/29 14:26
+ */
+ @Override
+ public WaitPakin mergeItems(WaitPakinParam waitPakin) {
+ return waitPakinService.mergeItems(waitPakin);
+ }
+
+ @Override
+ public WaitPakin unBind(WaitPakinParam param) {
+ return waitPakinService.unBind(param);
+ }
+
/**
* 鑾峰彇ReceiptDetlsDtos
*/
@@ -416,7 +445,7 @@
.setMatnrId(matnr.getId())
.setStockUnit(matnr.getStockUnit());
QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
- .eq(QlyInspect::getAsnItemId, asnOrderItem.getId()));
+ .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
if (!Objects.isNull(inspect)) {
//set 璐ㄦ缁撴灉
detlsDto.setInspect(inspect.getStatus$());
--
Gitblit v1.9.1