Merge remote-tracking branch 'origin/master'

cuilei

2025-06-20 ac4d1a5962441156ff22a0c87f4eacc083daa9a6

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InboundOrderController.java

@@ -252,17 +252,17 @@
    @AutoLog(value = "工具入库-新增入库")
    @ApiOperation(value = "工具入库-新增入库", notes = "工具入库-新增入库")
    @PostMapping("/addInStorage")
    public Result<?> addInStorage(@RequestBody JSONObject jSONObject) {
      inboundOrderService.addInStorage(jSONObject);
      return Result.OK("操作成功");
    public Result<List<Map<String,String>>> addInStorage(@RequestBody JSONObject jSONObject) {
       List<Map<String,String>> result  = inboundOrderService.addInStorage(jSONObject);
      return Result.OK(result);
    }

    @AutoLog(value = "工具入库-申请单入库")
    @ApiOperation(value = "工具入库-申请单入库", notes = "工具入库-申请单入库")
    @PostMapping("/addApplyInStorage")
    public Result<?> addApplyInStorage(@RequestBody JSONObject jSONObject) {
       inboundOrderService.addApplyInStorage(jSONObject);
       return Result.OK("操作成功");
    public Result<List<Map<String,String>>> addApplyInStorage(@RequestBody JSONObject jSONObject) {
       List<Map<String,String>> result  = inboundOrderService.addApplyInStorage(jSONObject);
       return Result.OK(result);
    }

}