From d510425cc8990f29ae2ec729e3f24c545fcad5ef Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 02 四月 2025 17:17:27 +0800
Subject: [PATCH] 新增获取人工上架信息接口

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/OperateStockDto.java      |    8 ++
 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java     |   71 ++++++++++-------------
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java           |    3 +
 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java     |   15 ++++-
 rsf-server/src/main/resources/application.yml                                            |    2 
 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OpStockParams.java |   19 ++++++
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java  |   52 ++++++++++++++++
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java         |    1 
 8 files changed, 124 insertions(+), 47 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
index 5d55a19..7729419 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
@@ -1,14 +1,13 @@
 package com.vincent.rsf.server.api.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.vincent.rsf.framework.common.R;
 import com.vincent.rsf.framework.exception.CoolException;
 import com.vincent.rsf.server.api.controller.params.CheckObjParams;
+import com.vincent.rsf.server.api.controller.params.OpStockParams;
 import com.vincent.rsf.server.api.controller.params.OtherReceiptParams;
 import com.vincent.rsf.server.api.controller.params.ReceiptParams;
 import com.vincent.rsf.server.api.service.MobileService;
 import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
 import com.vincent.rsf.server.manager.entity.QlyIsptItem;
 import com.vincent.rsf.server.system.controller.BaseController;
 import com.vincent.rsf.server.system.controller.param.LoginParam;
@@ -201,8 +200,18 @@
     @PostMapping("/inspect/check/update")
     public R checkUpdate(@RequestBody QlyIsptItem params) {
         if (Objects.isNull(params)) {
-            throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
         return mobileService.checkUpdate(params);
     }
+
+    @ApiOperation("鑾峰彇涓婃灦淇℃伅")
+    @PreAuthorize("hasAuthority('manager:qlyInspect:list')")
+    @PostMapping("/stock/operate")
+    public R operateToStock(@RequestBody OpStockParams params) {
+        if (Objects.isNull(params)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        return mobileService.operateToStock(params);
+    }
 }
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OpStockParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OpStockParams.java
new file mode 100644
index 0000000..a0f2e0a
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OpStockParams.java
@@ -0,0 +1,19 @@
+package com.vincent.rsf.server.api.controller.params;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "OpStockParams", description = "浜哄伐涓婃灦鍙傛暟")
+public class OpStockParams {
+
+    @ApiModelProperty("鎷栫洏鐮�")
+    private String barcode;
+    @ApiModelProperty("鍗曞彿")
+    private String asnCode;
+    @ApiModelProperty("鐗╂枡缂栫爜")
+    private String matnrCode;
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/OperateStockDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/OperateStockDto.java
new file mode 100644
index 0000000..861b04d
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/OperateStockDto.java
@@ -0,0 +1,8 @@
+package com.vincent.rsf.server.api.entity.dto;
+
+import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+
+public class OperateStockDto extends AsnOrderItem {
+
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
index 173025d..76c5b8c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
@@ -2,6 +2,7 @@
 
 import com.vincent.rsf.framework.common.R;
 import com.vincent.rsf.server.api.controller.params.CheckObjParams;
+import com.vincent.rsf.server.api.controller.params.OpStockParams;
 import com.vincent.rsf.server.api.controller.params.OtherReceiptParams;
 import com.vincent.rsf.server.api.controller.params.ReceiptParams;
 import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
@@ -50,4 +51,6 @@
     R checkObjs(CheckObjParams params);
 
     R checkUpdate(QlyIsptItem params);
+
+    R operateToStock(OpStockParams params);
 }
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 ed48bfb..bced611 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
@@ -5,6 +5,7 @@
 import com.vincent.rsf.framework.common.R;
 import com.vincent.rsf.framework.exception.CoolException;
 import com.vincent.rsf.server.api.controller.params.CheckObjParams;
+import com.vincent.rsf.server.api.controller.params.OpStockParams;
 import com.vincent.rsf.server.api.controller.params.OtherReceiptParams;
 import com.vincent.rsf.server.api.controller.params.ReceiptParams;
 import com.vincent.rsf.server.api.entity.dto.CheckObjDto;
@@ -35,7 +36,7 @@
 import com.vincent.rsf.server.system.service.FieldsService;
 import com.vincent.rsf.server.system.service.UserLoginService;
 import com.vincent.rsf.server.system.utils.SerialRuleUtils;
-import org.apache.tika.utils.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -107,6 +108,9 @@
     @Autowired
     private FieldsItemService fieldsItemService;
 
+    @Autowired
+    private LocService locService;
+
 
     /**
      * @author Ryan
@@ -152,7 +156,7 @@
      */
     @Override
     public R getOrderByCode(String barcode) {
-        if (StringUtils.isEmpty(barcode)) {
+        if (StringUtils.isBlank(barcode)) {
             return R.error("鏍囩鐮佷笉鑳戒负绌猴紒锛�");
         }
         List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, barcode));
@@ -559,6 +563,50 @@
     }
 
     /**
+    * @author Ryan
+    * @description 浜哄伐涓婃灦
+    * @param
+    * @return
+    * @time 2025/4/2 16:33
+    */
+    @Override
+    public R operateToStock(OpStockParams params) {
+        if (org.apache.commons.lang3.StringUtils.isBlank(params.getBarcode())) {
+            throw new CoolException("鎷栫洏鐮佷笉鑳戒负绌猴紒锛�");
+        }
+        if (StringUtils.isBlank(params.getAsnCode())) {
+            throw new CoolException("鍗曟嵁涓嶈兘涓虹┖锛侊紒");
+        }
+        if (StringUtils.isBlank(params.getMatnrCode())) {
+            throw new CoolException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
+        }
+        AsnOrder asnOrders = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, params.getAsnCode()));
+        if (Objects.isNull(asnOrders)) {
+            throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+        }
+        List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, params.getBarcode()));
+        if (!locs.isEmpty()) {
+            throw new CoolException("鎷栫洏宸蹭娇鐢�");
+        }
+        List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, params.getBarcode()));
+        if (!waitPakins.isEmpty()) {
+            throw new CoolException("鎷栫洏宸蹭娇鐢�!!");
+        }
+        List<AsnOrderItem> orderItems = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
+                .eq(AsnOrderItem::getAsnId, asnOrders.getId())
+                .eq(AsnOrderItem::getMatnrCode, params.getMatnrCode()));
+        if (orderItems.isEmpty()) {
+            throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+        }
+        List<AsnOrderItem> stocks = new ArrayList<>();
+        orderItems.forEach(item -> {
+            item.setBarcode(params.getBarcode());
+            stocks.add(item);
+        });
+        return R.ok(stocks);
+    }
+
+    /**
      * 鑾峰彇ReceiptDetlsDtos
      */
     private R getAsnOrderItem(List<AsnOrderItem> items) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
index b9a8b68..b2f899c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
@@ -23,7 +23,6 @@
 public class AsnOrderItem implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
     /**
      * 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 c724cfa..3156c74 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
@@ -54,6 +54,7 @@
     * @time 2025/4/2 12:37
     */
     @Scheduled(cron = "0 0/05 * * * ?  ")
+//  @Scheduled(cron = "0/5 * * * * ?")
     @Transactional(rollbackFor = Exception.class)
     public void completeInStock() {
         List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id));
@@ -65,27 +66,14 @@
         if (taskItems.isEmpty()) {
             throw new CoolException("浠诲姟鏄庣粏涓虹┖锛侊紒");
         }
-        Map<Long, List<TaskItem>> listMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getTaskId));
+        /**瀵逛换鍔℃槑缁嗘寜璁㈠崟杩涜鍒嗙粍*/
+        Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getOrderId));
         List<StockItem> stockItems = new ArrayList<>();
-        for (Task task : tasks) {
-            List<TaskItem> taskItem = listMap.get(task.getId());
-            if (taskItem.isEmpty()) {
-                throw new CoolException("鏁版嵁閿欒 ")
-            }
-            Stock stock = new Stock();
-
-            listMap.get(task.getId()).forEach(item -> {
-
-            });
-        }
-
-
-
-        taskItems.forEach(item -> {
-            Stock stock = new Stock();
+        orderMap.keySet().forEach(key -> {
             AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>()
-                    .eq(AsnOrder::getId, item.getOrderId())
+                    .eq(AsnOrder::getId, key)
                     .select(AsnOrder::getId, AsnOrder::getPoCode, AsnOrder::getCode));
+            Stock stock = new Stock();
             if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
                 Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
                 stock.setPlatOrderNo(purchase.getPlatCode()).setPlatToken(purchase.getPlatId());
@@ -95,34 +83,37 @@
                 throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
             }
             stock.setAsnId(order.getId()).setAsnCode(order.getCode());
-
             if (!stockService.save(stock)) {
                 throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
             }
-            Task taskServiceOne = taskService.getOne(new LambdaQueryWrapper<Task>()
-                    .select(Task::getId, Task::getTargLoc, Task::getOrgLoc, Task::getBarcode)
-                    .eq(Task::getId, item.getTaskId()));
-            Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, taskServiceOne.getTargLoc()));
-            if (Objects.isNull(loc)) {
-                throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
+            List<TaskItem> items = orderMap.get(key);
+            for (TaskItem item : items) {
+                /**閫氳繃浠诲姟鏄庣粏涓殑taskId鏌ヨ,鑾峰彇TASK鐨勭洰鏍囧簱浣嶄俊鎭�*/
+                Task taskServiceOne = taskService.getOne(new LambdaQueryWrapper<Task>()
+                        .select(Task::getId, Task::getTargLoc, Task::getOrgLoc, Task::getBarcode)
+                        .eq(Task::getId, item.getTaskId()));
+                Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, taskServiceOne.getTargLoc()));
+                if (Objects.isNull(loc)) {
+                    throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
+                }
+                AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, item.getOrderItemId()));
+                if (Objects.isNull(orderItem)) {
+                    throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+                }
+                StockItem stockItem = new StockItem();
+                BeanUtils.copyProperties(orderItem, stockItem);
+                stockItem.setAsnItemId(item.getOrderItemId())
+                        .setBarcode(taskServiceOne.getBarcode())
+                        .setLocId(loc.getId())
+                        .setId(null)
+                        .setStockId(stock.getId());
+                stockItems.add(stockItem);
             }
-            AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, item.getOrderItemId()));
-            if (Objects.isNull(orderItem)) {
-                throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+            if (!stockItemService.saveBatch(stockItems)) {
+                throw new CoolException("搴撳瓨淇敼鏋跺け璐ワ紒锛�");
             }
-            StockItem stockItem = new StockItem();
-            BeanUtils.copyProperties(orderItem, stockItem);
-            stockItem.setAsnItemId(item.getOrderItemId())
-                    .setBarcode(taskServiceOne.getBarcode())
-                    .setLocId(loc.getId())
-                    .setId(null)
-                    .setStockId(stock.getId());
-            stockItems.add(stockItem);
         });
-
-        if (!stockItemService.saveBatch(stockItems)) {
-            throw new CoolException("搴撳瓨淇敼鏋跺け璐ワ紒锛�");
-        }
+        /**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/
         List<String> locCodes = tasks.stream().map(Task::getTargLoc).collect(Collectors.toList());
         if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type).in(Loc::getCode, locCodes))) {
             throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
diff --git a/rsf-server/src/main/resources/application.yml b/rsf-server/src/main/resources/application.yml
index 4a03079..a844729 100644
--- a/rsf-server/src/main/resources/application.yml
+++ b/rsf-server/src/main/resources/application.yml
@@ -23,7 +23,7 @@
   #  global-config:
   #    field-strategy: 0
   configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     map-underscore-to-camel-case: true
     cache-enabled: true
     call-setters-on-nulls: true

--
Gitblit v1.9.1