From 1d073089d28720503a5350718f10c97a2a9dc502 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 03 五月 2025 19:32:19 +0800
Subject: [PATCH] 逻辑删除改成物理删除
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 b67b341..1a6b0ce 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
@@ -197,7 +197,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R receiptToWarehouse(Map<String, Object> params, Long loginUserId) {
+ public synchronized R receiptToWarehouse(Map<String, Object> params, Long loginUserId) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -428,7 +428,7 @@
public R getDeltByCode(String code) {
//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()
+ .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(WarehouseAreasItem::getTrackCode, code)
.groupBy(WarehouseAreasItem::getSplrBatch, WarehouseAreasItem::getAsnId, WarehouseAreasItem::getAreaId, WarehouseAreasItem::getMatnrId);
return R.ok(warehouseAreasItemService.getOne(queryWrapper));
@@ -641,7 +641,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("搴撲綅涓嶈兘涓虹┖锛侊紒");
}
@@ -773,7 +773,7 @@
*/
@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("鎷栫洏鐮佷笉鑳戒负绌猴紒锛�");
}
@@ -911,7 +911,7 @@
* @description 鐢熸垚浠诲姟鍒楄〃
*/
@Override
- public R generateTask(Map<String, Object> map, Long loginUserId) {
+ 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()) {
@@ -938,6 +938,8 @@
.setFieldsIndex(asnOrderItem.getFieldsIndex())
.setBarcode(asnOrderItem.getTrackCode())
.setQty(asnOrderItem.getQty())
+ .setStockUnit(asnOrderItem.getStockUnit())
+ .setPurUnit(asnOrderItem.getPurUnit())
.setPoCode(asnOrderItem.getPoCode())
.setAnfme(asnOrderItem.getAnfme())
.setPurQty(asnOrderItem.getPurQty())
@@ -949,8 +951,7 @@
}
//SET 鐗╂枡鏈�澶у瓨鏀炬暟閲�
detlsDto.setMaxQty(matnr.getMaxQty())
- .setMatnrId(matnr.getId())
- .setStockUnit(matnr.getStockUnit());
+ .setMatnrId(matnr.getId());
QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
.eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
if (!Objects.isNull(inspect)) {
@@ -961,7 +962,7 @@
LocItem stockItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
// .eq(LocItem::getOrderItemId, asnOrderItem.getId())
.eq(LocItem::getFieldsIndex, asnOrderItem.getFieldsIndex())
- .eq(LocItem::getBatch, asnOrderItem.getBatch())
+ .eq(LocItem::getBatch, asnOrderItem.getSplrBatch())
.eq(LocItem::getMatnrId, asnOrderItem.getMatnrId()));
//SET 褰撳墠搴撳瓨鏁伴噺
if (Objects.isNull(stockItem)) {
--
Gitblit v1.9.1