From 6f4f866484c956cfbe3de3d4d60a723d4f2ba6c7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 17:03:24 +0800
Subject: [PATCH] no message

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java      |   48 ++++++++++++++++++++++++
 rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx                                             |    2 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java           |    4 +-
 rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx                                        |    2 
 rsf-admin/src/page/waitPakin/WaitPakinList.jsx                                                 |    1 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java |    2 
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java        |    9 ++--
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java         |    1 
 8 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index e2ef514..a34f785 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -136,7 +136,7 @@
               setSelect(record)
               setEditDialog(true)
             }}
-             omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'matnrId', 'asnId']}
+             omit={['id', 'createTime', 'purQty','purUnit', 'createBy', 'memo', 'poDetlId', 'matnrId', 'asnId']}
           >
             <NumberField source="id" />
             <NumberField source="asnId" label="table.field.asnOrderItem.asnId" />
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx b/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
index e14d8a5..611914e 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
@@ -119,7 +119,7 @@
                     preferenceKey='waitPakinItem'
                     bulkActionButtons={false}
                     rowClick={(id, resource, record) => false}
-                    omit={['id', 'pakinId', 'createTime', 'createBy', 'memo']}
+                    omit={['id', 'pakinId', 'createTime', 'createBy', 'memo', 'fieldsIndex']}
                 >
                     <NumberField source="id" />
                     <NumberField source="pakinId" label="table.field.waitPakinItem.pakinId" />
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinList.jsx b/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
index c593b01..0d519b2 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
@@ -101,6 +101,7 @@
         const createTask = () => {
             setSiteDialog(true)
             setSource(rows)
+            onUnselectItems()
             refresh()
         }
 
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..3645c2f 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
@@ -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));
@@ -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)) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index 0c1f658..1b53b5f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -191,7 +191,6 @@
         return R.ok();
     }
 
-
     @PreAuthorize("hasAuthority('manager:task:update')")
     @ApiOperation("浠诲姟鍑哄簱缃《")
     @PostMapping("/task/top/{id}")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 4246785..8fe1876 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -57,8 +57,8 @@
     * @return
     * @time 2025/4/2 12:37
     */
-    @Scheduled(cron = "0 0/05 * * * ?  ")
-//  @Scheduled(cron = "0/5 * * * * ?")
+//    @Scheduled(cron = "0 0/05 * * * ?  ")
+    @Scheduled(cron = "0/15 * * * * ?")
     @Transactional(rollbackFor = Exception.class)
     public void completeInStock() throws Exception {
         List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id));
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index fcc9fcb..444690f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -61,6 +61,9 @@
     @Autowired
     private WarehouseAreasService warehouseAreasService;
 
+    @Autowired
+    private WarehouseAreasItemService warehouseAreasItemService;
+
 
     /**
      * @param
@@ -168,6 +171,13 @@
             if (!taskItemService.saveBatch(taskItems)) {
                 throw new CoolException("浠诲姟鏄庣粏淇濆瓨澶辫触锛侊紒");
             }
+            waitPakinItems.forEach(item -> {
+               if (! waitPakinItemService.update(new LambdaUpdateWrapper<WaitPakinItem>()
+                       .set(WaitPakinItem::getWorkQty, item.getAnfme())
+                       .eq(WaitPakinItem::getId, item.getId()))) {
+                   throw new CoolException("缁勬墭鏄庣粏淇墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
+               }
+            });
         });
 
         if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
@@ -223,6 +233,8 @@
             //淇濆瓨搴撳瓨鏄庣粏
             try {
                 saveStockItems(items, pakinItem);
+                //绉诲嚭鏀惰揣鍖哄簱瀛�
+                removeReceiptStock(pakinItem);
             } catch (Exception e) {
                 throw new CoolException("搴撳瓨绠$悊淇濆瓨鏇存柊澶辫触锛侊紒");
             }
@@ -238,6 +250,42 @@
 
     /**
      * @author Ryan
+     * @description 绉婚櫎鏀惰揣鍖哄簱瀛�
+     * @param
+     * @return
+     * @time 2025/4/30 16:32
+     */
+    @Transactional(rollbackFor = Exception.class)
+    private void removeReceiptStock(WaitPakinItem pakinItem) {
+        WarehouseAreasItem itemServiceOne = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
+                .eq(WarehouseAreasItem::getTrackCode, pakinItem.getTrackCode())
+                .eq(WarehouseAreasItem::getSplrBatch, pakinItem.getBatch()));
+        if (Objects.isNull(itemServiceOne)) {
+            throw new CoolException("鏁版嵁閿欒锛岃鏌ョ湅璇疯揣鍖哄簱瀛樻槸鍚﹀瓨鍦紒锛�");
+        }
+        Double workQty = itemServiceOne.getWorkQty() - pakinItem.getAnfme();
+        Double qty = itemServiceOne.getQty() + pakinItem.getAnfme();
+        itemServiceOne.setWorkQty(workQty).setQty(qty);
+
+        if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
+                .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val)
+                .eq(WaitPakin::getId, pakinItem.getPakinId()))) {
+            throw new CoolException("缁勬嫋鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+        }
+
+        if (qty.compareTo(itemServiceOne.getAnfme()) == 0.00) {
+            if (!warehouseAreasItemService.removeById(itemServiceOne.getId())) {
+                throw new CoolException("鏀惰揣鍖虹墿鏂欏垹闄ゅけ璐ワ紒锛�");
+            }
+        } else {
+            if (!warehouseAreasItemService.updateById(itemServiceOne)) {
+                throw new CoolException("鏀惰揣鍖哄簱瀹屾垚鏁伴噺淇敼澶辫触锛侊紒");
+            }
+        }
+    }
+
+    /**
+     * @author Ryan
      * @description 鏇存柊搴撲綅鏄庣粏
      * @param
      * @return
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index 0d6bed9..c558873 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -148,7 +148,7 @@
             }
         } else {
             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")
+                    .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch, qty, unit, stock_unit, work_qty, matnr_code, matnr_id, maktx")
                     .lambda()
                     .in(WarehouseAreasItem::getTrackCode, tracks)
                     .groupBy(WarehouseAreasItem::getSplrBatch,

--
Gitblit v1.9.1