From 7f7491da89fdec2ccf678c104b449213ea4fdbef Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 七月 2025 13:27:54 +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/PdaCheckOrderServiceImpl.java | 61 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
index 88a132a..b6a9e2d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
@@ -23,6 +23,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
@Service
@@ -45,8 +46,7 @@
private DictDataService dictDataService;
@Autowired
private MatnrService matnrService;
- @Autowired
- private CheckOrderService checkOrderService;
+
@Override
public R getCheckList(String code) {
@@ -103,11 +103,15 @@
if (null == task) {
throw new CoolException("鏁版嵁閿欒锛屾湭鎵惧埌瀹瑰櫒鐮佸搴旂洏鐐逛换鍔�");
}
- for (CheckDiffItem checkDiffItem : params.getCheckDiffItems()) {
+ for (CheckDiffItem ckDiffItem : params.getCheckDiffItems()) {
CheckDiffItem diffItem = new CheckDiffItem();
- if (Objects.isNull(checkDiffItem.getId())) {
- BeanUtils.copyProperties(checkDiffItem, diffItem);
- diffItem.setCheckId(params.getCheckId());
+ if (Objects.isNull(ckDiffItem.getId())) {
+ BeanUtils.copyProperties(ckDiffItem, diffItem);
+ diffItem.setCheckId(params.getCheckId())
+ .setOrderCode(checkDiff.getOrderCode())
+ .setTaskId(task.getId())
+ .setBarcode(task.getBarcode())
+ .setAnfme(ckDiffItem.getCheckQty());
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, diffItem.getMatnrCode()));
if (Objects.isNull(matnr)) {
@@ -122,6 +126,7 @@
BeanUtils.copyProperties(diffItem, diffItem);
taskItem.setTaskId(task.getId())
.setOrderType(OrderType.ORDER_CHECK.type)
+ .setSourceCode(diffItem.getOrderCode())
.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.type))
.setAnfme(diffItem.getAnfme())
.setWorkQty(0.0)
@@ -145,22 +150,35 @@
if (!taskItemService.save(taskItem)) {
throw new CoolException("鏂板鐩樼偣鏄庣粏淇濆瓨澶辫触锛侊紒");
}
+
+ diffItem.setTaskItemId(taskItem.getId());
+
+ if (!checkDiffItemService.updateById(diffItem)) {
+ throw new CoolException("鏄庣粏淇敼澶辫触锛侊紒");
+ }
} else {
- diffItem = checkDiffItemService.getById(checkDiffItem.getId());
+ diffItem = checkDiffItemService.getById(ckDiffItem.getId());
if (null == diffItem) {
return R.error("鏁版嵁閿欒锛屾湭鎵惧埌宸紓鍗曟槑缁�");
}
+ diffItem.setCheckQty(ckDiffItem.getCheckQty()).setReason(ckDiffItem.getReason()).setMemo(ckDiffItem.getMemo());
}
- checkDiffItem.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);
- if (!checkDiffItemService.updateById(checkDiffItem)) {
+ diffItem.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);
+ if (!checkDiffItemService.updateById(diffItem)) {
throw new CoolException("鏇存柊宸紓鍗曟槑缁嗗け璐�");
}
- Double checkQty = Math.round((checkDiff.getCheckQty() + checkDiffItem.getCheckQty()) * 10000) / 10000.0;
- checkDiff.setCheckQty(checkQty);
+// Double checkQty = Math.round((checkDiff.getCheckQty() + diffItem.getCheckQty()) * 10000) / 10000.0;
+// checkDiff.setCheckQty(checkQty);
}
- checkDiff.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);
+ List<CheckDiffItem> diffItems = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>()
+ .eq(CheckDiffItem::getCheckId, checkDiff.getId()));
+ if (diffItems.isEmpty()) {
+ throw new CoolException("鐩樼偣宸紓鍗曟槑缁嗕笉瀛樺湪锛侊紒");
+ }
+ Double sum = diffItems.stream().mapToDouble(CheckDiffItem::getCheckQty).sum();
+ checkDiff.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val).setCheckQty(sum);
if (!checkDiffService.updateById(checkDiff)) {
throw new CoolException("鏇存柊宸紓鍗曞け璐�");
}
@@ -173,4 +191,23 @@
}
return R.ok("鐩樼偣瀹屾垚");
}
+
+ @Override
+ public R selectAddMatnr(Map<String, String> map) {
+ String matnrCode = map.get("matnr");
+ if (Cools.isEmpty(matnrCode)){
+ return R.error("鐗╂枡鐮佷负绌�");
+ }
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, matnrCode));
+ if (null == matnr){
+ return R.error("鏈壘鍒扮紪鐮佸搴旂殑鏄庣粏");
+ }
+ CheckDiffItem checkDiffItem = new CheckDiffItem()
+ .setMatnrCode(matnr.getCode())
+ .setMaktx(matnr.getName())
+ .setAnfme(0D)
+ .setCheckQty(0D)
+ ;
+ return R.ok(checkDiffItem);
+ }
}
--
Gitblit v1.9.1