From c17e36e49be715a3305c79625187631184278c19 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期四, 05 六月 2025 09:52:16 +0800
Subject: [PATCH] 申请单入库
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InboundOrderController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InboundOrderController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InboundOrderController.java
index 9b4a4bb..71e4a00 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InboundOrderController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InboundOrderController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.tms.controller;
+import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -12,8 +13,10 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.jeecg.modules.tms.entity.InboundDetail;
@@ -101,6 +104,8 @@
InboundOrder inboundOrder = jSONObject.toJavaObject(InboundOrder.class);
inboundOrder.setOrderStatus("1");
inboundOrder.setInStatus("1");
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ inboundOrder.setHandler(user.getUsername());
inboundOrder.setInboundNum(businessCodeRuleService.generateBusinessCodeSeq("InBoundOrder"));
inboundOrderService.save(inboundOrder);
// 淇濆瓨鍏ュ簱鐢宠鍗曟槑缁嗘暟鎹�
@@ -108,7 +113,11 @@
List<InboundDetail> list = jsonArray.toJavaList(InboundDetail.class);
for (int i = 0; i < list.size(); i++) {
InboundDetail temp = list.get(i);
+ temp.setId(null);
temp.setInStorehouseId(inboundOrder.getId());
+ temp.setInActualCount(BigDecimal.ZERO);
+ temp.setInStatus("1");
+ temp.setToolId(temp.getOnlyCode());
temp.setToolCode(temp.getToolCodeId());
}
inboundDetailService.saveBatch(list);
@@ -135,7 +144,11 @@
List<InboundDetail> list = jsonArray.toJavaList(InboundDetail.class);
for (int i = 0; i < list.size(); i++) {
InboundDetail temp = list.get(i);
+ temp.setId(null);
temp.setInStorehouseId(inboundOrder.getId());
+ temp.setInStatus("1");
+ temp.setInActualCount(BigDecimal.ZERO);
+ temp.setToolId(temp.getOnlyCode());
temp.setToolCode(temp.getToolCodeId());
}
inboundDetailService.saveOrUpdateBatch(list);
@@ -236,11 +249,20 @@
}
- @AutoLog(value = "鏂板鍏ュ簱")
- @ApiOperation(value = "鏂板鍏ュ簱鎿嶄綔", notes = "鏂板鍏ュ簱鎿嶄綔")
+ @AutoLog(value = "宸ュ叿鍏ュ簱-鏂板鍏ュ簱")
+ @ApiOperation(value = "宸ュ叿鍏ュ簱-鏂板鍏ュ簱", notes = "宸ュ叿鍏ュ簱-鏂板鍏ュ簱")
@PostMapping("/addInStorage")
public Result<?> addInStorage(@RequestBody JSONObject jSONObject) {
inboundOrderService.addInStorage(jSONObject);
return Result.OK("鎿嶄綔鎴愬姛");
}
+
+ @AutoLog(value = "宸ュ叿鍏ュ簱-鐢宠鍗曞叆搴�")
+ @ApiOperation(value = "宸ュ叿鍏ュ簱-鐢宠鍗曞叆搴�", notes = "宸ュ叿鍏ュ簱-鐢宠鍗曞叆搴�")
+ @PostMapping("/addApplyInStorage")
+ public Result<?> addApplyInStorage(@RequestBody JSONObject jSONObject) {
+ inboundOrderService.addApplyInStorage(jSONObject);
+ return Result.OK("鎿嶄綔鎴愬姛");
+ }
+
}
--
Gitblit v1.9.3