From 5b883298571421132edf68cab7a22ab16a1f0a6b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 11 九月 2025 17:32:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java
index 8ad41ca..ec28cdf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java
@@ -1,19 +1,22 @@
package com.ruoyi.web.controller.api;
+import com.lkl.laop.sdk.request.V3LabsTransPreorderRequest;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.dto.InventoryDto;
+import com.ruoyi.system.dto.InventoryGoodsDto;
import com.ruoyi.system.dto.WarehousingGoodsDto;
-import com.ruoyi.system.query.TErpGoodsQuery;
-import com.ruoyi.system.query.TErpGoodsWarehouseQuery;
-import com.ruoyi.system.query.TErpInventoryQuery;
-import com.ruoyi.system.query.ValidityPeriodWarningQuery;
+import com.ruoyi.system.query.*;
+import com.ruoyi.system.service.TErpGoodsService;
import com.ruoyi.system.service.TErpSupplierWarehousingService;
import com.ruoyi.system.vo.*;
+import com.ruoyi.web.core.config.LakalaAlipayConfig;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -34,11 +37,13 @@
public class TErpSupplierWarehousingController {
private final TErpSupplierWarehousingService erpSupplierWarehousingService;
+ private final TErpGoodsService erpGoodsService;
private final TokenService tokenService;
@Autowired
- public TErpSupplierWarehousingController(TErpSupplierWarehousingService erpSupplierWarehousingService, TokenService tokenService) {
+ public TErpSupplierWarehousingController(TErpSupplierWarehousingService erpSupplierWarehousingService, TErpGoodsService erpGoodsService, TokenService tokenService) {
this.erpSupplierWarehousingService = erpSupplierWarehousingService;
+ this.erpGoodsService = erpGoodsService;
this.tokenService = tokenService;
}
@@ -50,6 +55,11 @@
@ApiOperation(value = "供应商获取库存分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<TErpGoodsVO>> pageList(@RequestBody TErpGoodsQuery query) {
+ V3LabsTransPreorderRequest request = new V3LabsTransPreorderRequest();
+ request.setLklAppId(LakalaAlipayConfig.appId);
+ request.setMerchantNo(LakalaAlipayConfig.MerchantNo);
+ request.setTermNo(LakalaAlipayConfig.TermNo);
+
SysUser user = tokenService.getLoginUser().getUser();
return R.ok(erpSupplierWarehousingService.pageList(query,user));
}
@@ -109,6 +119,22 @@
}
+ @ApiOperation(value = "供应商 盘点 商品选择")
+ @PostMapping(value = "/pageInventoryGoodsPageList")
+ public R<PageInfo<TErpGoodsInventoryVO>> pageInventoryGoodsPageList(@RequestBody @Valid TErpGoodsInventoryQuery query) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ return R.ok(erpGoodsService.pageInventoryGoodsPageList(query,user));
+ }
+
+ @ApiOperation(value = "供应商 确认盘点")
+ @PostMapping(value = "/inventoryGoods")
+ public R<?> inventoryGoods(@RequestBody @Valid InventoryDto dto) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ erpGoodsService.inventoryGoods(dto,user);
+ return R.ok();
+ }
+
+
}
--
Gitblit v1.7.1