From 6fd5d255ffb664241ac081b6b09fc1cda32abd7f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 15:46:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 421 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 293 insertions(+), 128 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 79542a6..e3f9273 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,15 +8,15 @@
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.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderWorkType;
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.*;
@@ -84,6 +84,8 @@
private QlyIsptItemService qlyIsptItemService;
@Resource
private StockItemMapper stockItemMapper;
+ @Autowired
+ private LocItemService locItemService;
@Resource
private PurchaseItemMapper purchaseItemMapper;
@Resource
@@ -121,12 +123,14 @@
private LocAreaRelaMapper locAreaRelaMapper;
@Autowired
private LocAreaMapper locAreaMapper;
+ @Autowired
+ private DeviceSiteMapper deviceSiteMapper;
/**
+ * @return
* @author Ryan
* @description 鎵嬫寔PDA鐧诲綍鎺ュ彛
* @params LoginParam param锛� HttpServletRequest request
- * @return
* @time 2025/3/10 15:36
*/
@Override
@@ -158,10 +162,10 @@
}
/**
- * @author Ryan
- * @description 鎵爜鑾峰彇鏀惰揣鏄庣粏
* @param barcode
* @return
+ * @author Ryan
+ * @description 鎵爜鑾峰彇鏀惰揣鏄庣粏
* @time 2025/3/10 15:37
*/
@Override
@@ -169,7 +173,10 @@
if (StringUtils.isBlank(barcode)) {
return R.error("鏍囩鐮佷笉鑳戒负绌猴紒锛�");
}
- List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, barcode));
+ List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
+ .eq(AsnOrderItem::getTrackCode, barcode));
+
+
if (Objects.isNull(asnOrderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -178,15 +185,16 @@
}
/**
+ * @param params
+ * @param loginUserId
+ * @return
* @author Ryan
* @description 鏀惰揣鑷虫敹璐у尯
- * @param params
- * @return
* @time 2025/3/10 15:41
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R receiptToWarehouse(Map<String, Object> params) {
+ public synchronized R receiptToWarehouse(Map<String, Object> params, Long loginUserId) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -205,7 +213,6 @@
}
List<ReceiptDetlsDto> receipts = receiptParam.getReceipts();
- List<WarehouseAreasItem> allOrders = new ArrayList<>();
Double receiptQty = receipts.stream().mapToDouble(ReceiptDetlsDto::getReceiptQty).sum();
@@ -222,14 +229,16 @@
}
//TODO /**鏀惰揣鏁伴噺绱姞锛�1. 浼氬嚭瓒呮敹鎯呭喌 2. 浼氭湁鏀惰揣涓嶈冻鎯呭喌*/
Double rcptedQty = asnOrder.getQty() + receiptQty;
- asnOrder.setQty(rcptedQty).setExceStatus(Short.parseShort(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val));
+ asnOrder.setQty(rcptedQty).setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
if (!asnOrderMapper.updateById(asnOrder)) {
throw new CoolException("宸叉敹璐ф暟閲忎慨鏀瑰け璐ワ紒锛�");
}
List<Map<String, Object>> receipts1 = (List<Map<String, Object>>) params.get("receipts");
for (Map<String, Object> rcpt : receipts1) {
- if (Objects.isNull(rcpt)) {continue;}
+ if (null == rcpt || Objects.isNull(rcpt)) {
+ continue;
+ }
ReceiptDetlsDto dto = JSONObject.parseObject(JSONObject.toJSONString(rcpt), ReceiptDetlsDto.class);
Matnr matnr = matnrMapper.selectById(dto.getMatnrId());
if (Objects.isNull(matnr)) {
@@ -241,18 +250,24 @@
// if (dto.getReceiptQty().compareTo(dto.getAnfme()) > 0) {
// throw new CoolException("鏀惰揣鏁伴噺涓嶈兘澶т簬閲囪喘鏁伴噺锛侊紒");
// }
- AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnCode, asnCode)
- .eq(AsnOrderItem::getMatnrId, dto.getMatnrId()));
+// AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>()
+// .eq(AsnOrderItem::getAsnCode, asnCode)
+// .eq(AsnOrderItem::getId, dto.getId())
+// .eq(AsnOrderItem::getTrackCode, dto.getBarcode())
+// .eq(AsnOrderItem::getSplrBatch, dto.getSplrBatch()));
+
+ AsnOrderItem orderItem = asnOrderItemMapper.resultById(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, dto.getId()));
+
if (Objects.isNull(orderItem)) {
throw new CoolException("閫氱煡鍗曟槑缁嗕笉瀛樺湪锛侊紒");
}
if (Objects.isNull(dto.getReceiptQty()) || Double.compare(dto.getReceiptQty(), 0.0) == 0) {
- throw new CoolException("鐗╂枡:" + dto.getMaktx() + "鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒");
+ throw new CoolException("鐗╂枡:" + dto.getMaktx() + "鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒");
}
Double itemRcptQty = dto.getReceiptQty() + orderItem.getQty();
orderItem.setQty(itemRcptQty)
- .setSplrBatch(dto.getSplrBatch())
+// .setSplrBatch(dto.getSplrBatch())
+ .setUpdateBy(loginUserId)
.setStockUnit(dto.getStockUnit())
.setProdTime(dto.getProdTime());
@@ -260,7 +275,7 @@
try {
if (Objects.isNull(rcpt.get("fieldsindex")) || StringUtils.isBlank(rcpt.get("fieldsindex").toString())) {
//鑾峰彇16浣島uid
- String uuid16 = CommonUtil.randomUUID16();
+ String uuid16 = Cools.md5(dto.getBarcode());
rcpt.put("index", uuid16);
orderItem.setFieldsIndex(uuid16);
}
@@ -274,60 +289,86 @@
if (asnOrderItemMapper.updateById(orderItem) < 1) {
throw new CoolException("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�");
}
+ /**淇濆瓨鏄庣粏鑷虫敹璐у尯**/
+ extracted(loginUserId, dto, areasItem, orderItem, asnOrder, matnr);
- WarehouseAreasItem item = new WarehouseAreasItem();
-// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// String format = null;
-// if (Objects.isNull(dto.getProdTime())) {
-// format = dateFormat.format(dto.getProdTime());
-// }
- item.setTrackCode(dto.getBarcode())
- .setAreaName(areasItem.getName())
- .setAreaId(areasItem.getId())
- .setAsnItemId(orderItem.getId())
- .setAsnCode(asnOrder.getCode())
- .setAsnId(asnOrder.getId())
- .setProdTime(dto.getProdTime())
- .setWeight(dto.getWeigth())
- .setStockUnit(dto.getStockUnit())
- .setBatch(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto))
- .setAnfme(dto.getReceiptQty())
- .setSplrBatch(dto.getSplrBatch())
- .setMatnrCode(matnr.getCode())
- .setMatnrId(matnr.getId())
- .setMaktx(matnr.getName())
- //搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
- .setUnit(dto.getStockUnit())
- .setStockUnit(dto.getStockUnit())
- .setWeight(matnr.getWeight())
- .setFieldsIndex(orderItem.getFieldsIndex())
- .setShipperId(matnr.getShipperId());
- //TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲
-
- allOrders.add(item);
}
- if (!warehouseAreasItemService.saveBatch(allOrders)) {
+ AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, asnCode));
+ if (order.getQty().compareTo(order.getAnfme()) >= 0.00) {
+ order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val).setRleStatus(Short.valueOf("1"));
+ if (!asnOrderMapper.updateById(order)) {
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+
+ return R.ok("鏀惰揣鎴愬姛锛侊紒");
+ }
+
+ private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, AsnOrderItem orderItem, AsnOrder asnOrder, Matnr matnr) {
+ WarehouseAreasItem item = new WarehouseAreasItem();
+ item.setTrackCode(dto.getBarcode())
+ .setAreaName(areasItem.getName())
+ .setAreaId(areasItem.getId())
+ .setAsnItemId(orderItem.getId())
+ .setAsnCode(asnOrder.getCode())
+ .setAsnId(asnOrder.getId())
+ .setProdTime(dto.getProdTime())
+ .setWeight(dto.getWeigth())
+ //搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
+ .setUnit(orderItem.getStockUnit())
+ .setStockUnit(orderItem.getStockUnit())
+ .setBatch(StringUtils.isBlank(orderItem.getBatch()) ? SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto) : orderItem.getBatch())
+ .setAnfme(dto.getReceiptQty())
+ .setSplrBatch(dto.getSplrBatch())
+ .setMatnrCode(matnr.getCode())
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
+ .setMatnrId(matnr.getId())
+ .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(StringUtils.isNotBlank(item.getSplrBatch()), WarehouseAreasItem::getSplrBatch, item.getSplrBatch()));
+ if (!Objects.isNull(serviceOne)) {
+ item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
+ }
+
+ //鏈川妫�
+ if (!warehouseAreasItemService.saveOrUpdate(item)) {
throw new CoolException("鏀惰揣澶辫触锛侊紒");
}
-// //鑾峰彇閲囪喘鏁伴噺
-// double purQty = receipts.stream().mapToDouble(ReceiptDetlsDto::getPurQty).sum();
+
+// if (null != orderItem.getSafeQty() || null != orderItem.getDisQty() ) {
//
-// BigDecimal subtract = BigDecimal.valueOf(receiptQty).subtract(BigDecimal.valueOf(purQty));
-// //鍒ゆ柇宸叉敹璐ф暟閲忔槸鍚﹀皬浜庣瓑浜庨噰璐暟閲�
-// if (subtract.compareTo(new BigDecimal("0.0")) <= 0) {
-// asnOrder.setRleStatus(Short.valueOf("1"));
-// //鏃ュ織琛ㄦ搷浣�
-// operateOrderLogs(asnOrder);
// }
- return R.ok(asnOrder);
+// else {
+// //涓嶅悎鏍兼暟閲�
+// if (orderItem.getDisQty().compareTo(0.00) > 0) {
+// item.setIsptQty(orderItem.getDisQty()).setFlagNorm(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val);
+// if (!warehouseAreasItemService.saveOrUpdate(item)) {
+// throw new CoolException("鏀惰揣澶辫触锛侊紒");
+// }
+// }
+//
+// item.setIsptQty(orderItem.getSafeQty()).setFlagNorm(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val);
+// if (!warehouseAreasItemService.saveOrUpdate(item)) {
+// throw new CoolException("鏀惰揣澶辫触锛侊紒");
+// }
+// }
+
+
}
/**
- * @author Ryan
- * @description 鍏跺畠鏀惰揣
* @param params
* @return
+ * @author Ryan
+ * @description 鍏跺畠鏀惰揣
*/
@Override
public R otherReceipt(OtherReceiptParams params) {
@@ -336,32 +377,42 @@
}
List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
.eq(AsnOrderItem::getAsnCode, params.getAsnCode())
- .eq(!Objects.isNull(params.getTrackCode()) ,AsnOrderItem::getTrackCode, params.getTrackCode()));
+ .eq(!Objects.isNull(params.getTrackCode()), AsnOrderItem::getTrackCode, params.getTrackCode())
+ .eq(!Cools.isEmpty(params.getMatnrCode()), AsnOrderItem::getMatnrCode, params.getMatnrCode())
+ );
if (Objects.isNull(asnOrderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
+ List<Short> shorts = Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_TASK_CANCEL.val, AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE
+ .val, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
+ AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>()
+ .notIn(AsnOrder::getExceStatus, shorts)
+ .eq(AsnOrder::getCode, params.getAsnCode()));
+ if (Objects.isNull(order)) {
+ throw new CoolException("璇锋鏌ヨ鍗曠姸鎬佹槸鍚﹀凡瀹屾垚鎴栧凡鍙栨秷锛侊紒");
+ }
- return getAsnOrderItem(asnOrderItem);
+ return getAsnOrderItem(asnOrderItem);
}
/**
+ * @return
* @author Ryan
* @description 鑾峰彇鎵�鏈夐�氱煡鍗�
- * @return
*/
@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;
}
/**
- * @author Ryan
- * @description 鑾峰彇鏀惰揣鍖�
* @param
* @return
+ * @author Ryan
+ * @description 鑾峰彇鏀惰揣鍖�
* @time 2025/3/11 10:12
*/
@Override
@@ -371,10 +422,10 @@
}
/**
- * @author Ryan
- * @description 鑾峰彇鎵�鏈夊惎鐢ㄥ姩鎬佸瓧娈�
* @param
* @return
+ * @author Ryan
+ * @description 鑾峰彇鎵�鏈夊惎鐢ㄥ姩鎬佸瓧娈�
* @time 2025/3/12 09:23
*/
@Override
@@ -383,20 +434,28 @@
}
/**
- * @author Ryan
- * @description 鑾峰彇缁勭洏鏄庣粏
* @param
* @return
+ * @author Ryan
+ * @description 鑾峰彇缁勭洏鏄庣粏
* @time 2025/4/7 16:58
*/
@Override
- public R getDeltByCode(String code) {
+ public R getDeltByCode(Map<String, Object> params) {
+ Object code = params.get("code");
+ Object matnrCode = params.get("matnrCode");
+ 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, qty, work_qty, matnr_code, matnr_id, maktx").lambda()
- .eq(WarehouseAreasItem::getTrackCode, code)
- .groupBy(WarehouseAreasItem::getSplrBatch, WarehouseAreasItem::getAsnId, WarehouseAreasItem::getAreaId, WarehouseAreasItem::getMatnrId);
- return R.ok(warehouseAreasItemService.getOne(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);
}
/**
@@ -413,10 +472,10 @@
}
/**
- * @author Ryan
- * @description 瑙ｇ粦
* @param param
* @return
+ * @author Ryan
+ * @description 瑙ｇ粦
*/
@Override
public WaitPakin unBind(WaitPakinParam param) {
@@ -425,6 +484,7 @@
/**
* 鎶ユ鍔熻兘
+ *
* @param code
* @param loginUserId
* @return
@@ -465,10 +525,10 @@
}
/**
- * @author Ryan
- * @description 鎻愪氦鎶ユ
* @param
* @return
+ * @author Ryan
+ * @description 鎻愪氦鎶ユ
* @time 2025/4/1 16:47
*/
@Override
@@ -483,14 +543,15 @@
List<AsnOrder> orders = new ArrayList<>();
orders.add(asnOrder);
if (asnOrderMapper.notifyInspect(orders)) {
- return R.ok("涓婃姤鎴愬姛锛侊紒");
- }else {
+ return R.ok("涓婃姤鎴愬姛锛侊紒");
+ } else {
return R.error("涓婃姤澶辫触锛侊紒");
}
}
/**
* 閫氳繃鐗╂枡锛岃川妫�鍗曡幏鍙栭渶瑕佽川妫�鍗曟嵁
+ *
* @param params
* @return
*/
@@ -501,7 +562,7 @@
}
List<Short> asList = Arrays.asList(QlyIsptStatus.QLY_ISPT_STAS_DONE.val, QlyIsptStatus.QLY_ISPT_STAS_CLOSE.val);
QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
- .notIn(QlyInspect::getIsptStatus, asList)
+ .notIn(QlyInspect::getIsptStatus, asList)
.eq(QlyInspect::getCode, params.getIsptCode()));
if (Objects.isNull(inspect)) {
throw new CoolException("璐ㄦ鍗曟嵁涓嶅瓨鍦紒!");
@@ -536,6 +597,7 @@
/**
* 蹇�熻川妫�
+ *
* @param params
* @return
*/
@@ -554,12 +616,12 @@
}
/**
- * @author Ryan
- * @description 浜哄伐涓婃灦
- * @param
- * @return
- * @time 2025/4/2 16:33
- */
+ * @param
+ * @return
+ * @author Ryan
+ * @description 浜哄伐涓婃灦
+ * @time 2025/4/2 16:33
+ */
@Override
public R operateToStock(OpStockParams params) {
if (org.apache.commons.lang3.StringUtils.isBlank(params.getBarcode())) {
@@ -603,7 +665,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R publicToStock(PublicToStockParams params, Long loginUserId) {
+ public synchronized R publicToStock(PublicToStockParams params, Long loginUserId) {
if (Objects.isNull(params.getLocCode()) || StringUtils.isBlank(params.getLocCode())) {
throw new CoolException("搴撲綅涓嶈兘涓虹┖锛侊紒");
}
@@ -616,35 +678,64 @@
.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();
- stock.setAsnId(OrderId).setAsnCode(order.getCode());
- if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
- Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
- if (!Objects.isNull(purchase)) {
- stock.setPlatOrderNo(purchase.getPlatCode()).setPlatToken(purchase.getPlatId());
- }
- }
+// if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
+// Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
+// if (!Objects.isNull(purchase)) {
+// stock.setPlatOrderNo(purchase.getPlatCode()).setPlatToken(purchase.getPlatId());
+// }
+// }
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
if (StringUtils.isBlank(ruleCode)) {
throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
}
+ List<AsnOrderItem> itemList = params.getItemList();
+ double sum = itemList.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ 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("搴撳瓨淇濆瓨澶辫触锛侊紒");
}
+ //TODO 骞冲簱涓婃灦绛栫暐闂锛� 1 骞冲簱搴撲綅鏄崟鐙璁★紝杩樻槸涓庝骇搴撲竴璧风敤绫诲瀷鍖哄垎
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, params.getLocCode()));
if (Objects.isNull(loc)) {
throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
}
+ //locItemSerivce
+ List<LocItem> locItems = new ArrayList<>();
+ itemList.forEach(asnOrderItem -> {
+ LocItem item = new LocItem();
+ BeanUtils.copyProperties(asnOrderItem, item);
+ item.setLocId(loc.getId())
+ .setId(null)
+ .setLocCode(loc.getCode())
+ .setOrderId(order.getId())
+ .setUpdateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setOrderItemId(asnOrderItem.getId())
+ .setWkType(Short.parseShort(order.getWkType()))
+ .setType(order.getType());
+ locItems.add(item);
+ });
+ if (!locItemService.saveBatch(locItems)) {
+ throw new CoolException("搴撲綅鏄庣粏鏇存柊澶辫触锛侊紒");
+ }
+
List<StockItem> stockItems = new ArrayList<>();
- params.getItemList().forEach(orderItem -> {
+ itemList.forEach(orderItem -> {
StockItem stockItem = new StockItem();
BeanUtils.copyProperties(orderItem, stockItem);
- stockItem.setAsnItemId(orderItem.getId())
+ stockItem.setSourceItemId(orderItem.getId())
.setBarcode(orderItem.getBarcode())
- .setLocId(loc.getId())
+ .setStockCode(stock.getCode())
.setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
.setId(null)
.setStockId(stock.getId());
stockItems.add(stockItem);
@@ -658,6 +749,7 @@
/**
* 鑾峰彇浠诲姟淇℃伅
+ *
* @param code
* @return
*/
@@ -702,14 +794,14 @@
}
/**
- * @Author Ryan
* @param code
- * @desc 浠诲姟涓婃灦
* @return
+ * @Author Ryan
+ * @desc 浠诲姟涓婃灦
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R taskGetLocs(String code) throws Exception {
+ public synchronized R taskGetLocs(String code) throws Exception {
if (StringUtils.isBlank(code)) {
throw new CoolException("鎷栫洏鐮佷笉鑳戒负绌猴紒锛�");
}
@@ -731,18 +823,21 @@
@Override
public R completeOrder(Long id, Long loginUserId) {
- return asnOrderMapper.completeOrder(id, loginUserId);
+ return asnOrderMapper.completeOrder(id, loginUserId);
}
/**
- * @author Ryan
- * @description 閫氳繃瀹瑰櫒鑾峰彇缁勬嫋鐗╂枡
* @param
* @return
+ * @author Ryan
+ * @description 閫氳繃瀹瑰櫒鑾峰彇缁勬嫋鐗╂枡
* @time 2025/4/9 16:57
*/
@Override
public R getItemByContainer(Map<String, Object> params) {
+// 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;
@@ -751,7 +846,7 @@
}
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 (Objects.isNull(waitPakin)) {
return R.ok(new ArrayList<>());
@@ -766,11 +861,8 @@
} 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);
+ .in(WarehouseAreasItem::getTrackCode, list);
List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
for (int i = 0; i < warehouseAreasItems.size(); i++) {
for (WaitPakinItem pakinItem : pakinItems) {
@@ -784,16 +876,81 @@
}
/**
- * @author Ryan
- * @description 涓嶈壇鏍囩
* @param
* @return
+ * @author Ryan
+ * @description 涓嶈壇鏍囩
* @time 2025/4/12 08:12
*/
@Override
public R defectProducts(String trackCode) {
AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, trackCode));
return R.ok(orderItem);
+ }
+
+ /**
+ * @param barcode
+ * @return
+ * @author Ryan
+ * @description 鑾峰彇鍏ュ簱缁勬嫋淇℃伅
+ */
+ @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);
+ }
+
+ /**
+ * @return
+ * @author Ryan
+ * @description 鑾峰彇搴撳彛绔欑偣淇℃伅
+ */
+ @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);
+ }
+
+ /**
+ * @return
+ * @author Ryan
+ * @description 鑾峰彇鎺ㄨ崘搴撲綅
+ */
+ @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 synchronized 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));
+
}
/**
@@ -805,14 +962,21 @@
ReceiptDetlsDto detlsDto = new ReceiptDetlsDto();
detlsDto.setAsnCode(asnOrderItem.getAsnCode())
+ .setId(asnOrderItem.getId())
.setMaktx(asnOrderItem.getMaktx())
.setFieldsIndex(asnOrderItem.getFieldsIndex())
.setBarcode(asnOrderItem.getTrackCode())
.setQty(asnOrderItem.getQty())
+ .setStockUnit(asnOrderItem.getStockUnit())
+ .setPurUnit(asnOrderItem.getPurUnit())
.setPoCode(asnOrderItem.getPoCode())
.setAnfme(asnOrderItem.getAnfme())
.setPurQty(asnOrderItem.getPurQty())
- .setSplrBatch(asnOrderItem.getSplrBatch());
+ .setSplrBatch(asnOrderItem.getSplrBatch())
+ .setMatnr(asnOrderItem.getMatnrCode())
+ .setInspect(asnOrderItem.getIsptResult$()) //璐ㄦ缁撴灉
+ .setPlatItemId(asnOrderItem.getPlatItemId())
+ ;
Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId());
if (Objects.isNull(matnr)) {
@@ -820,23 +984,24 @@
}
//SET 鐗╂枡鏈�澶у瓨鏀炬暟閲�
detlsDto.setMaxQty(matnr.getMaxQty())
- .setMatnrId(matnr.getId())
- .setStockUnit(matnr.getStockUnit());
- QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
- .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
- if (!Objects.isNull(inspect)) {
- //set 璐ㄦ缁撴灉
- detlsDto.setInspect(inspect.getStatus$());
- }
+ .setMatnrId(matnr.getId());
+// QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
+// .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
+// if (!Objects.isNull(inspect)) {
+// //set 璐ㄦ缁撴灉
+// detlsDto.setInspect(inspect.getStatus$());
+// }
//鑾峰彇褰撳墠搴撳瓨淇℃伅
- StockItem stockItem = stockItemMapper.selectOne(new LambdaQueryWrapper<StockItem>()
- .eq(StockItem::getAsnItemId, asnOrderItem.getId())
- .eq(StockItem::getMatnrId, asnOrderItem.getMatnrId()));
+ LocItem stockItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
+// .eq(LocItem::getOrderItemId, asnOrderItem.getId())
+ .eq(LocItem::getFieldsIndex, asnOrderItem.getFieldsIndex())
+ .eq(LocItem::getBatch, asnOrderItem.getSplrBatch())
+ .eq(LocItem::getMatnrId, asnOrderItem.getMatnrId()));
//SET 褰撳墠搴撳瓨鏁伴噺
if (Objects.isNull(stockItem)) {
detlsDto.setStockQty(0.0);
} else {
- detlsDto.setStockQty(stockItem.getQty() + stockItem.getWorkQty());
+ detlsDto.setStockQty(stockItem.getAnfme() + stockItem.getWorkQty());
}
if (!Objects.isNull(asnOrderItem.getPoDetlId())) {
--
Gitblit v1.9.1