From 014270352f8e19b51bbb4367ae2ff256050a30a2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 14:03:42 +0800
Subject: [PATCH] #修改优化 1. 字典优化修改 2. 编码规则优化 3. 出库单编码生成为空问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 2 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 70b0ec2..a22179e 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
@@ -17,6 +17,7 @@
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.*;
@@ -123,6 +124,8 @@
private LocAreaRelaMapper locAreaRelaMapper;
@Autowired
private LocAreaMapper locAreaMapper;
+ @Autowired
+ private DeviceSiteMapper deviceSiteMapper;
/**
* @author Ryan
@@ -245,6 +248,7 @@
// }
AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>()
.eq(AsnOrderItem::getAsnCode, asnCode)
+ .eq(AsnOrderItem::getTrackCode, dto.getBarcode())
.eq(AsnOrderItem::getMatnrId, dto.getMatnrId()));
if (Objects.isNull(orderItem)) {
throw new CoolException("閫氱煡鍗曟槑缁嗕笉瀛樺湪锛侊紒");
@@ -355,7 +359,7 @@
*/
@Override
public List<AsnOrder> getAllAsnOrders() {
- List<AsnOrder> asnOrders = asnOrderMapper.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWkType, OrderWorkType.ORDER_PURCHASE_IN.type));
+ List<AsnOrder> asnOrders = asnOrderMapper.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type));
return asnOrders;
}
@@ -618,7 +622,7 @@
.eq(AsnOrder::getId, OrderId)
.eq(AsnOrder::getType, OrderType.ORDER_PLAT_IN.type));
if (Objects.isNull(order)) {
- throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ throw new CoolException("闈炲钩搴撳崟鎹笉鍙墽琛屼汉宸ヤ笂鏋讹紒锛�");
}
Stock stock = new Stock();
// if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
@@ -822,6 +826,71 @@
}
/**
+ * @author Ryan
+ * @description 鑾峰彇鍏ュ簱缁勬嫋淇℃伅
+ * @param barcode
+ * @return
+ */
+ @Override
+ public R getPakinInStock(String barcode) {
+ WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode));
+ if (Objects.isNull(waitPakin)) {
+ throw new CoolException("缁勬嫋鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
+ if (pakinItems.isEmpty()) {
+ return R.ok(new ArrayList<>());
+ }
+ return R.ok(pakinItems);
+ }
+
+ /**
+ * @author Ryan
+ * @description 鑾峰彇搴撳彛绔欑偣淇℃伅
+ * @return
+ */
+ @Override
+ public R getDeviceSites() {
+ List<DeviceSite> sites = deviceSiteMapper.selectList(new LambdaQueryWrapper<DeviceSite>()
+ .select(DeviceSite::getId, DeviceSite::getSite, DeviceSite::getName)
+ .eq(DeviceSite::getStatus, 1)
+ .groupBy(DeviceSite::getSite, DeviceSite::getId, DeviceSite::getName));
+ return R.ok(sites);
+ }
+
+ /**
+ * @author Ryan
+ * @description 鑾峰彇鎺ㄨ崘搴撲綅
+ * @return
+ */
+ @Override
+ public R getRecommondLocs() {
+ return R.ok(locService.list(new LambdaQueryWrapper<Loc>().last("limit 10")));
+ }
+
+ /**
+ * @param map
+ * @param loginUserId
+ * @return
+ * @author Ryan
+ * @description 鐢熸垚浠诲姟鍒楄〃
+ */
+ @Override
+ public R generateTask(Map<String, Object> map, Long loginUserId) {
+ String barcode = map.get("barcode").toString();
+ List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode));
+ if (waitPakins.isEmpty()) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦� 锛侊紒");
+ }
+ GenerateTaskParams taskParams = new GenerateTaskParams();
+ taskParams.setWaitPakins(waitPakins)
+ .setSiteId(Long.parseLong(map.get("site").toString()))
+ .setLocCode(map.get("locCode").toString());
+ return R.ok(taskService.generateTasks(taskParams, loginUserId));
+
+ }
+
+ /**
* 鑾峰彇ReceiptDetlsDtos
*/
private R getAsnOrderItem(List<AsnOrderItem> items) {
--
Gitblit v1.9.1