From dc60b3451a2984722c01a5991e5b904b8bd44f0d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 21:30:33 +0800
Subject: [PATCH] 组绑解绑
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 120 ++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 68 insertions(+), 52 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 3edd8e4..a81605c 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
@@ -8,23 +8,17 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.*;
import com.vincent.rsf.server.api.entity.dto.*;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.enums.OrderWorkType;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.api.service.MobileService;
import com.vincent.rsf.server.common.config.ConfigProperties;
import com.vincent.rsf.server.common.enums.WarehouseAreaType;
import com.vincent.rsf.server.common.security.JwtSubject;
-import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.common.utils.JwtUtil;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.controller.params.IsptItemsParams;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.AsnExceStatus;
-import com.vincent.rsf.server.manager.enums.PakinIOStatus;
-import com.vincent.rsf.server.manager.enums.QlyIsptResult;
-import com.vincent.rsf.server.manager.enums.QlyIsptStatus;
import com.vincent.rsf.server.manager.mapper.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.constant.CodeRes;
@@ -38,7 +32,6 @@
import com.vincent.rsf.server.system.service.UserLoginService;
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
-import org.apache.commons.codec.digest.Md5Crypt;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,8 +41,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
@@ -261,7 +252,8 @@
// .eq(AsnOrderItem::getTrackCode, dto.getBarcode())
// .eq(AsnOrderItem::getSplrBatch, dto.getSplrBatch()));
- AsnOrderItem orderItem = asnOrderItemMapper.resultById(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, dto.getId()));
+ AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, dto.getId()));
+ //asnOrderItemMapper.resultById(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, dto.getId()));
if (Objects.isNull(orderItem)) {
throw new CoolException("閫氱煡鍗曟槑缁嗕笉瀛樺湪锛侊紒");
@@ -280,7 +272,8 @@
try {
if (Objects.isNull(rcpt.get("fieldsindex")) || StringUtils.isBlank(rcpt.get("fieldsindex").toString())) {
//鑾峰彇16浣島uid
- String uuid16 = Cools.md5(dto.getBarcode());
+// String uuid16 = Cools.md5(dto.getBarcode());
+ String uuid16 = Cools.md5(dto.getId() + dto.getMatnr());
rcpt.put("index", uuid16);
orderItem.setFieldsIndex(uuid16);
}
@@ -330,16 +323,21 @@
.setUpdateBy(loginUserId)
.setCreateBy(loginUserId)
.setMatnrId(matnr.getId())
+ .setIsptResult(orderItem.getIsptResult())
.setMaktx(matnr.getName())
.setWeight(matnr.getWeight())
.setFieldsIndex(orderItem.getFieldsIndex())
.setShipperId(matnr.getShipperId());
//TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲
WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
- .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
- .eq(WarehouseAreasItem::getTrackCode, item.getTrackCode())
+// .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
+ .eq(WarehouseAreasItem::getMatnrCode, item.getMatnrCode())
+ .eq(!Cools.isEmpty(item.getFieldsIndex()), WarehouseAreasItem::getFieldsIndex, item.getFieldsIndex())
+ .eq(WarehouseAreasItem::getAsnCode, item.getAsnCode())
+ .eq(!Cools.isEmpty(item.getIsptResult()), WarehouseAreasItem::getIsptResult, item.getIsptResult())
.eq(StringUtils.isNotBlank(item.getSplrBatch()), WarehouseAreasItem::getSplrBatch, item.getSplrBatch()));
if (!Objects.isNull(serviceOne)) {
+ item.setId(serviceOne.getId());
item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
}
@@ -422,7 +420,8 @@
*/
@Override
public R getReceiptAreas() {
- List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type));
+ List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
+ .eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type));
return R.ok(areas);
}
@@ -449,18 +448,18 @@
public R getDeltByCode(Map<String, Object> params) {
Object code = params.get("code");
Object matnrCode = params.get("matnrCode");
- String batch = null;
- if (!Objects.isNull(params.get("batch"))) {
- batch = params.get("batch").toString();
- }
+ Object asnCode = params.get("asnCode");
+ Object batch = params.get("batch");
+
//TODO 鍚庣画闇�鏍规嵁绛栫暐閰嶇疆锛岃幏鍙栫粍鎷栨暟鎹�傚锛氭贩瑁咃紝鎸夋壒娆℃贩瑁呯瓑
- LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()
- .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch,unit, stock_unit, qty, work_qty, matnr_code, matnr_id, maktx").lambda()
- .eq(!Objects.isNull(code), WarehouseAreasItem::getTrackCode, code)
- .eq(StringUtils.isNotBlank(batch), WarehouseAreasItem::getSplrBatch, batch)
- .eq(!Objects.isNull(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode)
- .groupBy(WarehouseAreasItem::getSplrBatch, WarehouseAreasItem::getAsnId, WarehouseAreasItem::getAreaId, WarehouseAreasItem::getMatnrId);
- return R.ok(warehouseAreasItemService.list(queryWrapper));
+ LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
+ .eq(!Cools.isEmpty(code), WarehouseAreasItem::getTrackCode, code)
+ .eq(!Cools.isEmpty(batch), WarehouseAreasItem::getSplrBatch, batch)
+ .eq(!Cools.isEmpty(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode)
+ .eq(!Cools.isEmpty(asnCode), WarehouseAreasItem::getAsnCode, asnCode);
+ List<WarehouseAreasItem> list = warehouseAreasItemService.list(queryWrapper);
+ list.removeIf(e -> e.getAnfme() <= e.getWorkQty());
+ return R.ok(list);
}
/**
@@ -474,11 +473,6 @@
@Override
public WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId) {
return waitPakinService.mergeItems(waitPakin, userId);
- }
-
- @Override
- public WaitPakin mergeMatnrItems(WaitPakinParam waitPakin, Long userId) {
- return waitPakinService.mergeMatnrItems(waitPakin, userId);
}
/**
@@ -706,6 +700,8 @@
stock.setAnfme(sum)
.setSourceId(order.getId())
.setType(order.getType())
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
.setWkType(Short.parseShort(order.getWkType()));
if (!stockService.save(stock)) {
throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
@@ -724,6 +720,8 @@
.setId(null)
.setLocCode(loc.getCode())
.setOrderId(order.getId())
+ .setUpdateBy(loginUserId)
+ .setUpdateBy(loginUserId)
.setOrderItemId(asnOrderItem.getId())
.setWkType(Short.parseShort(order.getWkType()))
.setType(order.getType());
@@ -841,9 +839,9 @@
*/
@Override
public R getItemByContainer(Map<String, Object> params) {
- if (Objects.isNull(params.get("code"))) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
+// if (Objects.isNull(params.get("code"))) {
+// throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+// }
//鑾峰彇缁勬嫋鏈敓鎴愪换鍔＄殑缁勬嫋妗�
List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
Short flagDefect = 0;
@@ -852,8 +850,33 @@
}
WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, params.get("barcode").toString())
- .eq(WaitPakin::getFlagDefect, flagDefect)
+// .eq(WaitPakin::getFlagDefect, flagDefect)
.in(WaitPakin::getIoStatus, asList));
+ if (Cools.isEmpty(waitPakin)) {
+ throw new CoolException("鎵樼洏鍙敤");
+ } else {
+ throw new CoolException("鎵樼洏涓嶅彲鐢�");
+ }
+ }
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 閫氳繃瀹瑰櫒鑾峰彇缁勬嫋鐗╂枡
+ * @time 2025/4/9 16:57
+ */
+ @Override
+ public R getUnItemByContainer(Map<String, Object> params) {
+ if (Objects.isNull(params.get("barcode"))) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ //鑾峰彇缁勬嫋鏈敓鎴愪换鍔＄殑缁勬嫋妗�
+// List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
+
+ WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
+ .eq(WaitPakin::getBarcode, params.get("barcode").toString())
+ .eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
if (Objects.isNull(waitPakin)) {
return R.ok(new ArrayList<>());
}
@@ -862,27 +885,19 @@
if (pakinItems.isEmpty()) {
return R.ok(new ArrayList<>());
}
- if (!Objects.isNull(params.get("type")) && params.get("type").equals("defective")) {
- return R.ok(pakinItems);
- } else {
- List<String> list = pakinItems.stream().map(WaitPakinItem::getTrackCode).collect(Collectors.toList());
- LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()
- .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch, qty, work_qty, matnr_code, matnr_id, maktx")
- .lambda()
- .in(WarehouseAreasItem::getTrackCode, list)
- .groupBy(WarehouseAreasItem::getSplrBatch,
- WarehouseAreasItem::getTrackCode);
- List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
- for (int i = 0; i < warehouseAreasItems.size(); i++) {
- for (WaitPakinItem pakinItem : pakinItems) {
- if (warehouseAreasItems.get(i).getTrackCode().equals(pakinItem.getTrackCode())) {
- warehouseAreasItems.get(i).setAnfme(pakinItem.getAnfme());
- }
+ List<Long> list = pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toList());
+ LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>().in(WarehouseAreasItem::getId, list);
+ List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
+ for (int i = 0; i < warehouseAreasItems.size(); i++) {
+ for (WaitPakinItem pakinItem : pakinItems) {
+ if (warehouseAreasItems.get(i).getId().equals(pakinItem.getSource())) {
+ warehouseAreasItems.get(i).setAnfme(pakinItem.getAnfme());
}
}
- return R.ok(warehouseAreasItems);
}
+ return R.ok(warehouseAreasItems);
}
+
/**
* @param
@@ -984,6 +999,7 @@
.setSplrBatch(asnOrderItem.getSplrBatch())
.setMatnr(asnOrderItem.getMatnrCode())
.setInspect(asnOrderItem.getIsptResult$()) //璐ㄦ缁撴灉
+ .setPlatItemId(asnOrderItem.getPlatItemId())
;
Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId());
--
Gitblit v1.9.1