From 9c12e20237eb56bf2b53f3d751ba618b56954fad Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期六, 02 十二月 2023 17:44:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
index d4a2747..85d1297 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
@@ -18,12 +18,16 @@
import com.consum.base.pojo.response.UsingFormBackGoodsTemplateInfo;
import com.consum.base.pojo.response.UsingFormBackModelInfo;
import com.consum.base.pojo.response.UsingFormBackVO;
-import com.consum.base.service.BaseCategoryServiceImpl;
+import com.consum.base.service.BaseCategoryService;
+import com.consum.base.service.FinSysTenantDepartmentService;
+import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.UsingFormBackGoodsService;
import com.consum.base.service.UsingFormBackModelService;
import com.consum.base.service.UsingFormBackService;
import com.consum.model.po.BaseCategory;
+import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormTransfer;
import com.consum.model.po.UsingFormBack;
import com.consum.model.po.UsingFormBackGoods;
import com.consum.model.po.UsingFormBackModel;
@@ -54,18 +58,25 @@
@Autowired
private CodeGeneratorService codeGeneratorService;
@Autowired
- private BaseCategoryServiceImpl baseCategoryService;
+ private BaseCategoryService baseCategoryService;
@Autowired
private UsingFormBackModelService usingFormBackModelService;
@Autowired
private UsingFormBackGoodsService usingFormBackGoodsService;
-
+ @Autowired
+ private FinSysTenantDepartmentService finSysTenantDepartmentService;
+ @Autowired
+ private LWhFormTransferService lWhFormTransferService;
@Override
public void add(UsingFormBackParam usingFormBackParam, FinSysTenantUser sysInfo) {
Long departmentId = usingFormBackParam.getDepartmentId();
- String departmentName = usingFormBackParam.getDepartmentName();
+ FinSysTenantDepartment department = finSysTenantDepartmentService.getById(departmentId);
+ if (department == null) {
+ throw new RuntimeException("閮ㄩ棬涓嶅瓨鍦�");
+ }
+ String departmentName = department.getName();
Long operatorId = usingFormBackParam.getOperatorId();
String operatorName = usingFormBackParam.getOperatorName();
Long backTime = usingFormBackParam.getDealTime();
@@ -93,8 +104,12 @@
usingFormBackGoods.setClassification(classification);
usingFormBackGoods.setTransBusinessId(transBusinessId);
usingFormBackGoods.setBusinessFormCode(businessFormCode);
-// usingFormBackGoods.setTransOutWarehouseType();
-// usingFormBackGoods.setTransOutWarehouseId();
+
+ LWhFormTransfer lWhFormTransfer = lWhFormTransferService.selectById(transBusinessId);
+ Integer outWarehouseType = lWhFormTransfer.getOutWarehouseType();
+ Long outWarehouseId = lWhFormTransfer.getOutWarehouseId();
+ usingFormBackGoods.setTransOutWarehouseType(outWarehouseType);
+ usingFormBackGoods.setTransOutWarehouseId(outWarehouseId);
usingFormBackModelService.insert(usingFormBackGoods);
for (baseGoodModel model : backingGoodsInfo.getModels()) {
@@ -180,7 +195,7 @@
map.put("agencyId", agencyId);
}
if (StringUtils.isNotEmpty(createName)) {
- sql.append("AND ufb.CREATE_NAME = :createName ");
+ sql.append("AND ufb.OPERATOR_NAME = :createName ");
map.put("createName", createName);
}
sql.append("ORDER BY ufb.CREATE_TIME DESC ");
@@ -194,7 +209,8 @@
Long id = usingFormBackVO.getId();
StringBuilder countSql = new StringBuilder("SELECT \n"
+ "\tufbg.BASE_GOODS_TEMPLATE_NAME,\n"
- + "\tsum(ufbm.COUNTS) count\n"
+ + "\tsum(ufbm.COUNTS) count,\n"
+ + "\tufbm.UNIT\n"
+ "FROM\n"
+ "\tusing_form_back_goods ufbg\n"
+ "\tLEFT JOIN using_form_back_model ufbm ON ufbg.ID = ufbm.USING_FORM_BACK_GOODS_ID\n"
@@ -350,7 +366,7 @@
map.put("agencyId", agencyId);
}
if (StringUtils.isNotEmpty(createName)) {
- sql.append("AND ufb.CREATE_NAME = :createName ");
+ sql.append("AND ufb.OPERATOR_NAME = :createName ");
map.put("createName", createName);
}
sql.append("ORDER BY ufb.CREATE_TIME DESC ");
@@ -373,9 +389,9 @@
UsingFormBack usingFormBack = new UsingFormBack();
usingFormBack.setId(IdUtil.generateId());
usingFormBack.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.GOBACK));
-// usingFormBack.setOutWarehouseType();
-// usingFormBack.setOutWarehouseId();
-// usingFormBack.setOutWarehouseName();
+ usingFormBack.setOutWarehouseType(1);
+ usingFormBack.setOutWarehouseId(departmentId);
+ usingFormBack.setOutWarehouseName(departmentName);
String tenantId = sysInfo.getTenantId();
String tenantName = sysInfo.getTenantName();
@@ -384,9 +400,14 @@
usingFormBack.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
usingFormBack.setStates(1);
- usingFormBack.setDepartmentId(departmentId);
- usingFormBack.setDepartmentName(departmentName);
- usingFormBack.setOperatorId(operatorId);
+ Long sysDeptId = sysInfo.getSysDeptId();
+ FinSysTenantDepartment department = finSysTenantDepartmentService.getById(sysDeptId);
+ if (department == null) {
+ throw new RuntimeException("閮ㄩ棬涓嶅瓨鍦�");
+ }
+ usingFormBack.setDepartmentId(department.getId());
+ usingFormBack.setDepartmentName(department.getName());
+ usingFormBack.setOperatorId(sysInfo.getId());
usingFormBack.setOperatorName(operatorName);
usingFormBack.setDealTime(backTime);
usingFormBack.setProcureDoc(procureDoc);
--
Gitblit v1.9.1