From 3799e9f3fc8abaafa95094c8c987a8d9da3eb2a9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 13:11:19 +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/manager/controller/OutStockItemController.java |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
index 7504205..c665a12 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
@@ -19,6 +19,7 @@
 import com.vincent.rsf.server.manager.enums.CompanysType;
 import com.vincent.rsf.server.manager.service.AsnOrderItemService;
 import com.vincent.rsf.server.manager.service.CompanysService;
+import com.vincent.rsf.server.manager.service.OutStockItemService;
 import com.vincent.rsf.server.system.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,7 +37,7 @@
 public class OutStockItemController extends BaseController {
 
     @Autowired
-    private AsnOrderItemService asnOrderItemService;
+    private OutStockItemService outStockItemService;
 
     @Autowired
     private CompanysService companysService;
@@ -47,25 +48,25 @@
     public R page(@RequestBody Map<String, Object> map) {
         BaseParam baseParam = buildParam(map, BaseParam.class);
         PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
-        return R.ok().add(asnOrderItemService.listByAsnId(pageParam, pageParam.buildWrapper(true)));
+        return R.ok().add(outStockItemService.listByAsnId(pageParam, pageParam.buildWrapper(true)));
     }
 
     @PreAuthorize("hasAuthority('manager:outStockItem:list')")
     @PostMapping("/outStockItem/list")
     public R list(@RequestBody Map<String, Object> map) {
-        return R.ok().add(asnOrderItemService.list());
+        return R.ok().add(outStockItemService.list());
     }
 
     @PreAuthorize("hasAuthority('manager:outStockItem:list')")
     @PostMapping({"/outStockItem/many/{ids}", "/outStockItems/many/{ids}"})
     public R many(@PathVariable Long[] ids) {
-        return R.ok().add(asnOrderItemService.listByIds(Arrays.asList(ids)));
+        return R.ok().add(outStockItemService.listByIds(Arrays.asList(ids)));
     }
 
     @PreAuthorize("hasAuthority('manager:outStockItem:list')")
     @GetMapping("/outStockItem/{id}")
     public R get(@PathVariable("id") Long id) {
-        return R.ok().add(asnOrderItemService.getById(id));
+        return R.ok().add(outStockItemService.getById(id));
     }
 
     @PreAuthorize("hasAuthority('manager:outStockItem:save')")
@@ -78,7 +79,7 @@
         params.put("createBy", getLoginUserId());
         params.put("updateBy", getLoginUserId());
 
-        if (!asnOrderItemService.fieldsSave(params)) {
+        if (!outStockItemService.fieldsSave(params)) {
             return R.error("Save Fail");
         }
         return R.ok("Save Success");
@@ -99,7 +100,7 @@
                 asnOrderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
             }
         }
-        if (!asnOrderItemService.updateById(asnOrderItem)) {
+        if (!outStockItemService.updateById(asnOrderItem)) {
             return R.error("Update Fail");
         }
         return R.ok("Update Success").add(asnOrderItem);
@@ -109,7 +110,7 @@
     @OperationLog("Delete 鍑哄簱鍗曟槑缁�")
     @PostMapping("/outStockItem/remove/{ids}")
     public R remove(@PathVariable Long[] ids) {
-        if (!asnOrderItemService.removeByIds(Arrays.asList(ids))) {
+        if (!outStockItemService.removeByIds(Arrays.asList(ids))) {
             return R.error("Delete Fail");
         }
         return R.ok("Delete Success").add(ids);
@@ -123,7 +124,7 @@
         if (!Cools.isEmpty(condition)) {
             wrapper.like(AsnOrderItem::getId, condition);
         }
-        asnOrderItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+        outStockItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                 item -> vos.add(new KeyValVo(item.getId(), item.getId()))
         );
         return R.ok().add(vos);
@@ -137,14 +138,14 @@
         if (!Objects.isNull(map.get("ids"))) {
             List<Long> ids = JSONArray.parseArray(JSONObject.toJSONString(map.get("ids")), Long.class);
             if (!ids.isEmpty()) {
-                orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
+                orderItems = outStockItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
                         .in(AsnOrderItem::getId, ids)
                         .eq(AsnOrderItem::getStatus, 1));
             } else {
-                orderItems = asnOrderItemService.list(new LambdaQueryWrapper<>());
+                orderItems = outStockItemService.list(new LambdaQueryWrapper<>());
             }
         } else {
-            orderItems = asnOrderItemService.list(new LambdaQueryWrapper<>());
+            orderItems = outStockItemService.list(new LambdaQueryWrapper<>());
         }
 
         ExcelUtil.build(ExcelUtil.create(orderItems, AsnOrderItem.class, true), response);
@@ -163,7 +164,7 @@
             R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒");
         }
         HashMap<String, Object> hashMap = new HashMap<>();
-        return asnOrderItemService.excelImport(file, hashMap, getLoginUserId());
+        return outStockItemService.excelImport(file, hashMap, getLoginUserId());
     }
 
     /**

--
Gitblit v1.9.1