feat(stock): 优化出入库管理功能
- 在出库单页面添加仓库编码和仓库名称显示列 - 在入库单页面添加仓库选择功能和备注显示列 - 添加单据来源字段用于区分ERP/MES系统来源 - 优化物料管理页面的字段显示和表单布局 - 添加MES系统接口服务支持物料和单据传输 - 修复物料编码重复校验逻辑 - 优化入库单保存时的用户信息获取机制 - 添加安全配置支持MES/ERP接口访问权限 - 重构API控制器支持POST请求方式数据传输 - 优化库存物资视图显示仓库名称信息
This commit is contained in:
@@ -1,21 +1,17 @@
|
||||
package com.ruoyi.api.controller;
|
||||
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.ruoyi.api.domain.ReMaterialParam;
|
||||
import com.ruoyi.api.domain.RequestEnter;
|
||||
import com.ruoyi.api.domain.WmsJobRequest;
|
||||
import com.ruoyi.api.service.IToErpService;
|
||||
import com.ruoyi.api.service.IToWmsService;
|
||||
import com.ruoyi.bas.BasCustomer.domain.BasCustomer;
|
||||
import com.ruoyi.bas.BasProduct.domain.BasProduct;
|
||||
import com.ruoyi.bas.BasSupplier.domain.BasSupplier;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.log.domain.RequestLog;
|
||||
import com.ruoyi.log.service.IRequestLogService;
|
||||
import com.ruoyi.in.stockin.domain.vo.InstockInVo;
|
||||
import com.ruoyi.out.outStockout.domain.OutStockoutVo;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Map;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* 作业统计 Controller
|
||||
@@ -30,14 +26,14 @@ public class ToErpApiController {
|
||||
/**
|
||||
* 接收物料信息
|
||||
*/
|
||||
@GetMapping("/receiveMaterial")
|
||||
@PostMapping("/receiveMaterial")
|
||||
public AjaxResult receiveMaterial(@RequestBody BasProduct basProduct) {
|
||||
return toErpService.receiveMaterial(basProduct);
|
||||
}
|
||||
/**
|
||||
* 接收客户信息
|
||||
*/
|
||||
@GetMapping("/receiveCustomer")
|
||||
@PostMapping("/receiveCustomer")
|
||||
public AjaxResult receiveCustomer(@RequestBody BasCustomer basProduct) {
|
||||
return toErpService.receiveCustomer(basProduct);
|
||||
}
|
||||
@@ -45,8 +41,31 @@ public class ToErpApiController {
|
||||
/**
|
||||
* 接收供应商信息
|
||||
*/
|
||||
@GetMapping("/receiveSupplier")
|
||||
@PostMapping("/receiveSupplier")
|
||||
public AjaxResult receiveSupplier(@RequestBody BasSupplier basSupplier) {
|
||||
return toErpService.receiveSupplier(basSupplier);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取入库单据信息
|
||||
*/
|
||||
@PostMapping("/receiveInBill")
|
||||
public AjaxResult receiveInBill(@RequestBody InstockInVo inStockinVo) {
|
||||
return toErpService.receiveInBill(inStockinVo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取出库单据信息
|
||||
*/
|
||||
@PostMapping("/receiveOutBill")
|
||||
public AjaxResult receiveOutBill(@RequestBody OutStockoutVo outStockoutVo) {
|
||||
return toErpService.receiveOutBill(outStockoutVo);
|
||||
}
|
||||
/**
|
||||
* 单据信息回传
|
||||
*/
|
||||
@PostMapping("/callBackInAndOutBill")
|
||||
public AjaxResult callBackInAndOutBill() {
|
||||
return toErpService.callBackInAndOutBill();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.ruoyi.api.controller;
|
||||
|
||||
import com.ruoyi.api.service.IToErpService;
|
||||
import com.ruoyi.api.service.IToMesService;
|
||||
import com.ruoyi.bas.BasCustomer.domain.BasCustomer;
|
||||
import com.ruoyi.bas.BasProduct.domain.BasProduct;
|
||||
import com.ruoyi.bas.BasSupplier.domain.BasSupplier;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.in.stockin.domain.vo.InstockInVo;
|
||||
import com.ruoyi.out.outStockout.domain.OutStockoutVo;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
/**
|
||||
* 作业统计 Controller
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/api2mes")
|
||||
public class ToMesApiController {
|
||||
|
||||
@Autowired
|
||||
private IToMesService toMesService;
|
||||
|
||||
/**
|
||||
* 接收物料信息
|
||||
*/
|
||||
@PostMapping("/receiveMaterial")
|
||||
public AjaxResult receiveMaterial(@RequestBody BasProduct basProduct) {
|
||||
return toMesService.receiveMaterial(basProduct);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取入库单据信息
|
||||
*/
|
||||
@PostMapping("/receiveInBill")
|
||||
public AjaxResult receiveInBill(@RequestBody InstockInVo inStockinVo) {
|
||||
return toMesService.receiveInBill(inStockinVo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取出库单据信息
|
||||
*/
|
||||
@PostMapping("/receiveOutBill")
|
||||
public AjaxResult receiveOutBill(@RequestBody OutStockoutVo outStockoutVo) {
|
||||
return toMesService.receiveOutBill(outStockoutVo);
|
||||
}
|
||||
/**
|
||||
* 单据信息回传
|
||||
*/
|
||||
}
|
||||
@@ -103,13 +103,4 @@ public class ToWmsApiController {
|
||||
return ajaxResult;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 接收入库单据
|
||||
*/
|
||||
|
||||
/**
|
||||
* 接收出库单据
|
||||
*/
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user