From ffa9b04fbb25726c77458da5607c1b43bdd62603 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 七月 2025 08:25:46 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 70 ++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 34 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 04da855..299b122 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
@@ -231,16 +231,16 @@
String asnCode = receipts.stream().findFirst().get().getAsnCode();
- AsnOrder asnOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getCode, asnCode));
- if (Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getCode, asnCode));
+ if (Objects.isNull(wkOrder)) {
throw new CoolException("鏁版嵁閿欒锛氫富鍗曚笉瀛樺湪锛侊紒");
}
//TODO /**鏀惰揣鏁伴噺绱姞锛�1. 浼氬嚭瓒呮敹鎯呭喌 2. 浼氭湁鏀惰揣涓嶈冻鎯呭喌*/
- Double rcptedQty = asnOrder.getQty() + receiptQty;
+ Double rcptedQty = Math.round((wkOrder.getQty() + receiptQty) * 10000) / 10000.0;
- asnOrder.setQty(rcptedQty).setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
- if (!asnOrderMapper.updateById(asnOrder)) {
+ wkOrder.setQty(rcptedQty).setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
+ if (!asnOrderMapper.updateById(wkOrder)) {
throw new CoolException("宸叉敹璐ф暟閲忎慨鏀瑰け璐ワ紒锛�");
}
@@ -288,7 +288,7 @@
throw new CoolException("璇疯緭鍏ユ纭殑鏃堕棿鏍煎紡锛侊紒");
}
- Double itemRcptQty = dto.getReceiptQty() + orderItem.getQty();
+ Double itemRcptQty = Math.round((dto.getReceiptQty() + orderItem.getQty()) * 10000) / 10000.0;
Boolean allowOver = false;
if (!Objects.isNull(config)) {
if (Boolean.parseBoolean(config.getVal())) {
@@ -333,11 +333,11 @@
throw new CoolException("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�");
}
/**淇濆瓨鏄庣粏鑷虫敹璐у尯**/
- extracted(loginUserId, dto, areasItem, orderItem, asnOrder, matnr);
+ extracted(loginUserId, dto, areasItem, orderItem, wkOrder, matnr);
}
- AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, asnCode));
+ WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::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)) {
@@ -348,7 +348,7 @@
return R.ok("鏀惰揣鎴愬姛锛侊紒");
}
- private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, AsnOrderItem orderItem, AsnOrder asnOrder, Matnr matnr) {
+ private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, AsnOrderItem orderItem, WkOrder wkOrder, Matnr matnr) {
Companys companys = new Companys();
if (StringUtils.isNoneBlank(orderItem.getSplrCode())) {
@@ -360,8 +360,8 @@
.setAreaName(areasItem.getName())
.setAreaId(areasItem.getId())
.setAsnItemId(orderItem.getId())
- .setAsnCode(asnOrder.getCode())
- .setAsnId(asnOrder.getId())
+ .setAsnCode(wkOrder.getCode())
+ .setAsnId(wkOrder.getId())
.setProdTime(dto.getProdTime())
.setSplrId(companys.getId())
.setWeight(dto.getWeigth())
@@ -401,7 +401,8 @@
if (!Objects.isNull(serviceOne)) {
item.setId(serviceOne.getId());
- item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
+ Double anfme = Math.round((item.getAnfme() + serviceOne.getAnfme()) * 10000) / 10000.0;
+ item.setAnfme(anfme);
}
//鏈川妫�
@@ -444,9 +445,9 @@
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()));
+ WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>()
+ .notIn(WkOrder::getExceStatus, shorts)
+ .eq(WkOrder::getCode, params.getAsnCode()));
if (Objects.isNull(order)) {
throw new CoolException("璇锋鏌ヨ鍗曠姸鎬佹槸鍚﹀凡瀹屾垚鎴栧凡鍙栨秷锛侊紒");
}
@@ -480,9 +481,9 @@
* @description 鑾峰彇鎵�鏈夐�氱煡鍗�
*/
@Override
- public List<AsnOrder> getAllAsnOrders() {
- List<AsnOrder> asnOrders = asnOrderMapper.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type));
- return asnOrders;
+ public List<WkOrder> getAllAsnOrders() {
+ List<WkOrder> wkOrders = asnOrderMapper.list(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type));
+ return wkOrders;
}
/**
@@ -571,12 +572,12 @@
*/
@Override
public R inspect(String code, Long loginUserId) {
- AsnOrder asnOrders = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, code));
- if (Objects.isNull(asnOrders)) {
+ WkOrder wkOrders = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, code));
+ if (Objects.isNull(wkOrders)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
InspectDetlDto detlDto = new InspectDetlDto();
- detlDto.setCode(asnOrders.getCode()).setId(asnOrders.getId()).setPoCode(asnOrders.getPoCode());
+ detlDto.setCode(wkOrders.getCode()).setId(wkOrders.getId()).setPoCode(wkOrders.getPoCode());
List<AsnOrderItem> orderItems = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnCode, code));
if (orderItems.isEmpty()) {
detlDto.setItems(new ArrayList<>());
@@ -599,7 +600,7 @@
detlDto.setItems(itemDtos);
}
- List<IsptHistories> histories = isptHistoriesMapper.selectList(new LambdaQueryWrapper<IsptHistories>().eq(IsptHistories::getAsnId, asnOrders.getId()));
+ List<IsptHistories> histories = isptHistoriesMapper.selectList(new LambdaQueryWrapper<IsptHistories>().eq(IsptHistories::getAsnId, wkOrders.getId()));
detlDto.setHistories(histories);
return R.ok(detlDto);
}
@@ -616,12 +617,12 @@
if (org.apache.commons.lang3.StringUtils.isBlank(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- AsnOrder asnOrder = asnOrderMapper.getById(id);
- if (Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = asnOrderMapper.getById(id);
+ if (Objects.isNull(wkOrder)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
- List<AsnOrder> orders = new ArrayList<>();
- orders.add(asnOrder);
+ List<WkOrder> orders = new ArrayList<>();
+ orders.add(wkOrder);
if (asnOrderMapper.notifyInspect(orders)) {
return R.ok("涓婃姤鎴愬姛锛侊紒");
} else {
@@ -742,10 +743,10 @@
}
Long OrderId = params.getItemList().stream().findFirst().get().getAsnId();
/**鑾峰彇骞冲簱璁㈠崟*/
- AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getId, OrderId)
- .eq(AsnOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)
- .eq(AsnOrder::getType, OrderType.ORDER_IN.type));
+ WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getId, OrderId)
+ .eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)
+ .eq(WkOrder::getType, OrderType.ORDER_IN.type));
if (Objects.isNull(order)) {
throw new CoolException("闈炲钩搴撳崟鎹笉鍙墽琛屼汉宸ヤ笂鏋讹紒锛�");
}
@@ -943,8 +944,8 @@
// 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(!Cools.isEmpty(params.get("barcode")),WaitPakin::getBarcode, params.get("barcode").toString())
- .eq(!Cools.isEmpty(params.get("code")),WaitPakin::getCode, params.get("code").toString())
+ .eq(!Cools.isEmpty(params.get("barcode")),WaitPakin::getBarcode, params.get("barcode"))
+ .eq(!Cools.isEmpty(params.get("code")),WaitPakin::getCode, params.get("code"))
.eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
if (Objects.isNull(waitPakin)) {
return R.error("鏈壘鍒拌瀹瑰櫒鐮佺殑缁勬墭鏄庣粏锛岃妫�鏌ョ粍鎵樼姸鎬�");
@@ -1094,7 +1095,8 @@
if (Objects.isNull(stockItem)) {
detlsDto.setStockQty(0.0);
} else {
- detlsDto.setStockQty(stockItem.getAnfme() + stockItem.getWorkQty());
+ Double anfme = Math.round((stockItem.getAnfme() + stockItem.getWorkQty()) * 10000) / 10000.0;
+ detlsDto.setStockQty(anfme);
}
if (!Objects.isNull(asnOrderItem.getPoDetlId())) {
--
Gitblit v1.9.1