From 8ec414eb3a5173c1f53bd33b73519c78ca79938a Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 27 十月 2023 17:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java | 46 ++++--
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 54 +++++++
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 204 +++++++++++++++++++++++++++++
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 30 +++
consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputParam.java | 78 +++++++++++
consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java | 4
6 files changed, 394 insertions(+), 22 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
index f278db3..f97656e 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
@@ -13,6 +13,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
/**
* @Description 浠撳簱绠＄悊
* @Author 鍗㈠簡闃�
@@ -49,11 +51,11 @@
*/
@GetMapping("/list")
public ResponseValue queryList(BaseWarehouseParam param) {
- FinSysTenantUser sysInfo = this.getSysInfo();
- if (sysInfo == null) {
- return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
- }
- GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param,sysInfo);
+// FinSysTenantUser sysInfo = this.getSysInfo();
+// if (sysInfo == null) {
+// return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+// }
+ GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param);
return ResponseValue.success(pager);
}
@@ -77,7 +79,7 @@
}
/**
- * 鏍规嵁id鏌ヨ浠撳簱璇︽儏
+ * 鏍规嵁浠撳簱id鏌ヨ浠撳簱璇︽儏
* @author 鍗㈠簡闃�
* @Date 2023/10/26
*/
@@ -120,5 +122,21 @@
return ResponseValue.success();
}
+ /**
+ * @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/27
+ */
+ @GetMapping("/select/tenant_warehouse")
+ public ResponseValue getByAgencyId(Long agencyId) {
+ if (agencyId == null) {
+ return ResponseValue.error("鏈烘瀯id涓虹┖");
+ }
+ List<BaseWarehouse> list = this.baseWarehouseService.getByAgencyId(agencyId);
+ if (list == null) return ResponseValue.error("鏌ヨ澶辫触锛�");
+ return ResponseValue.success("鏌ヨ鎴愬姛!", list);
+ }
+
+
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
new file mode 100644
index 0000000..630e05c
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -0,0 +1,54 @@
+package com.consum.base.controller;
+
+import com.consum.base.BaseController;
+import com.consum.base.pojo.BaseGoodsTemplateParam;
+import com.consum.base.pojo.LWhFormOutputParam;
+import com.consum.base.service.BaseCategoryServiceImpl;
+import com.consum.base.service.LWhFormOutputServiceImpl;
+import com.consum.model.po.BaseGoodsTemplate;
+import com.consum.model.po.FinSysTenantUser;
+import com.iplatform.model.po.S_user_core;
+import com.walker.infrastructure.utils.StringUtils;
+import com.walker.web.ResponseValue;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * @Description 鍑哄簱鍗�
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/27
+ */
+@RestController
+@RequestMapping("/pc/l/wh/form/output")
+public class LWhFormOutputController extends BaseController {
+
+ @Autowired
+ private LWhFormOutputServiceImpl lWhFormOutputService;
+
+ /**
+ * @Description 鏂板鍑哄簱鍗�
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/27
+ */
+ @PostMapping("/add")
+ public ResponseValue add(@RequestBody LWhFormOutputParam param) {
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ int result = this.lWhFormOutputService.add(param, currentUser,this.getSysInfo());
+ if (result > 0) return ResponseValue.success(1);
+ return ResponseValue.error("鏂板澶辫触锛�");
+ }
+
+
+
+
+
+
+
+}
+
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputParam.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputParam.java
new file mode 100644
index 0000000..3825992
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputParam.java
@@ -0,0 +1,78 @@
+package com.consum.base.pojo;
+
+import com.consum.model.po.LWhGoodsRecord;
+import com.walker.web.param.ParamRequest;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @Description 鍑哄簱鍗曞弬鏁�
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/27
+ */
+public class LWhFormOutputParam extends ParamRequest {
+ /**
+ * 浠撳簱id
+ */
+ private Long warehouseId;
+ /**
+ * 鍑哄簱鏃堕棿
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate dealTime;
+
+ /**
+ * 璁板綍鐗╁搧淇℃伅鍜岃鏍煎瀷鍙�
+ */
+ private List<LWhGoodsRecord> list;
+ /**
+ * 鐗╁搧id
+ */
+ private Long baseGoodsTemplateId;
+ /**
+ * 鐗╁搧鍚嶇О
+ */
+ private String goodsTemplateName;
+
+ public Long getWarehouseId() {
+ return warehouseId;
+ }
+
+ public void setWarehouseId(Long warehouseId) {
+ this.warehouseId = warehouseId;
+ }
+
+ public LocalDate getDealTime() {
+ return dealTime;
+ }
+
+ public void setDealTime(LocalDate dealTime) {
+ this.dealTime = dealTime;
+ }
+
+ public List<LWhGoodsRecord> getList() {
+ return list;
+ }
+
+ public void setList(List<LWhGoodsRecord> list) {
+ this.list = list;
+ }
+
+ public Long getBaseGoodsTemplateId() {
+ return baseGoodsTemplateId;
+ }
+
+ public void setBaseGoodsTemplateId(Long baseGoodsTemplateId) {
+ this.baseGoodsTemplateId = baseGoodsTemplateId;
+ }
+
+ public String getGoodsTemplateName() {
+ return goodsTemplateName;
+ }
+
+ public void setGoodsTemplateName(String goodsTemplateName) {
+ this.goodsTemplateName = goodsTemplateName;
+ }
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
index f58c6a8..deb6a52 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
@@ -94,8 +94,8 @@
}
//鐘舵��
if (param.getStates() != null) {
- sql.append(" and status =:status ");
- paramts.put("status", param.getStates());
+ sql.append(" and states =:states ");
+ paramts.put("states", param.getStates());
} else {
sql.append(" and states !=3 ");
}
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
index 8201368..5a2733b 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
@@ -9,7 +9,6 @@
import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import org.springframework.beans.BeanUtils;
@@ -49,12 +48,12 @@
baseWarehouse.setId(IdUtil.generateId());
baseWarehouse.setWarehouseType(Constants.WAREHOUSE_TYPE_TENANT);
baseWarehouse.setWarehouseCode(codeGeneratorService.createWarehouseCode());
- //鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯
- FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(baseWarehouse.getAgencyId()));
- if (finSysTenant != null) {
- baseWarehouse.setParentAgencyId(finSysTenant.getParentId());
- baseWarehouse.setAgencyName(finSysTenant.getName());
- }
+// //鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯
+// FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(baseWarehouse.getAgencyId()));
+// if (finSysTenant != null) {
+// baseWarehouse.setParentAgencyId(finSysTenant.getParentId());
+// baseWarehouse.setAgencyName(finSysTenant.getName());
+// }
baseWarehouse.setIsDefault(Constants.IS_DEFAULT_YES);
return this.insert(baseWarehouse);
@@ -65,7 +64,8 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
- public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param, FinSysTenantUser sysInfo) {
+// public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param, FinSysTenantUser sysInfo) {
+ public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -80,12 +80,12 @@
paramts.put("CLASSIFICATION_CODE", param.getClassificationCode());
}
//鏈烘瀯id
- sql.append(" and AGENCY_ID =:AGENCY_ID ");
- if (param.getAgencyId() != null) {
- paramts.put("AGENCY_ID", param.getAgencyId());
- } else {
- paramts.put("AGENCY_ID", Long.valueOf(sysInfo.getTenantId()));
- }
+// sql.append(" and AGENCY_ID =:AGENCY_ID ");
+// if (param.getAgencyId() != null) {
+// paramts.put("AGENCY_ID", param.getAgencyId());
+// } else {
+// paramts.put("AGENCY_ID", Long.valueOf(sysInfo.getTenantId()));
+// }
//鐘舵��
if (param.getStates() != null) {
sql.append(" and states =:states ");
@@ -148,4 +148,22 @@
}
+
+ /**
+ * @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/27
+ * @return
+ */
+ public List<BaseWarehouse> getByAgencyId(Long agencyId) {
+ StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
+ HashMap<String, Object> paramts = new HashMap<>();
+
+ //鏈烘瀯id
+ if (agencyId != null) {
+ sql.append(" and AGENCY_ID =:AGENCY_ID ");
+ paramts.put("AGENCY_ID", agencyId);
+ }
+ return select(sql.toString(), paramts, new BaseWarehouse());
+ }
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
new file mode 100644
index 0000000..5ac7972
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
@@ -0,0 +1,204 @@
+package com.consum.base.service;
+
+import com.consum.base.Constants;
+import com.consum.base.core.param.BaseWarehouseParam1;
+import com.consum.base.pojo.LWhFormOutputParam;
+import com.consum.base.util.IdUtil;
+import com.consum.model.po.*;
+import com.iplatform.model.po.S_user_core;
+import com.walker.infrastructure.utils.DateUtils;
+import com.walker.jdbc.service.BaseServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+/**
+ * @Description 鍑哄簱鍗�
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/27
+ */
+@Slf4j
+@Service
+public class LWhFormOutputServiceImpl extends BaseServiceImpl {
+
+ @Autowired
+ private BaseWarehouseServiceImpl baseWarehouseService;
+ @Autowired
+ private LWhGoodsService lWhGoodsService;
+ @Autowired
+ private LWhProcureModelService lWhProcureModelService;
+ @Autowired
+ private LWhFormOutputCoreService lWhFormOutputCoreService;
+
+// /**
+// * @Description 鏂板鍑哄簱鍗�
+// * @Author 鍗㈠簡闃�
+// * @Date 2023/10/27
+// */
+// public int add(LWhFormOutputParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
+// //1.鏂板鍑哄簱鍗曡褰�
+// LWhFormOutput lWhFormOutput = new LWhFormOutput();
+// //鍑哄叆搴搃d
+// long lWhFormOutputId = IdUtil.generateId();
+// lWhFormOutput.setId(lWhFormOutputId);
+// Long warehouseId = param.getWarehouseId();
+// lWhFormOutput.setWarehouseId(warehouseId);
+// //鏍规嵁浠撳簱id鏌ヨ浠撳簱
+// BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId);
+// if (warehouse == null) {
+// log.error("浠撳簱id涓嶅瓨鍦�");
+// return 0;
+// }
+// lWhFormOutput.setWarehouseName(warehouse.getWarehouseName());
+// lWhFormOutput.setOutputCode(BaseWarehouseParam1.In_OutPutTypeEnum.Fragmentary_Output.getValue()+"");
+// lWhFormOutput.setOutputName("闆舵槦鍑哄簱");
+// lWhFormOutput.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
+// lWhFormOutput.setAgencyName(sysInfo.getTenantName());
+// lWhFormOutput.setOperatorId(sysInfo.getId());
+// lWhFormOutput.setOperatorName(sysInfo.getUserName());
+// long dateTimeNumber = DateUtils.getDateTimeNumber(System.currentTimeMillis());
+// lWhFormOutput.setDealTime(dateTimeNumber);
+// lWhFormOutput.setStates(1);
+// int flag1 = this.insert(lWhFormOutput);
+//
+// //2.鏍规嵁鍑哄簱鍗曞嚭搴�
+// Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutput.getId(), currentUser, dateTimeNumber);
+// //3.鍚戝嚭搴撳崟 鎻掑叆 杩涘嚭搴撴祦姘存�昏〃ID
+// int flag3 = 0;
+// if (flag1 > 0) {
+// LWhFormOutput lWhFormOutput1 = new LWhFormOutput(lWhFormOutputId);
+// lWhFormOutput1.setWarehouseFlowId(lWarehouseFlowId);
+// flag3 = this.update(lWhFormOutput1);
+// }
+//
+// //4.鏂板l_wh_goods_record璁板綍
+// List<LWhGoodsRecord> recordList = param.getList();
+// if (CollectionUtils.isEmpty(recordList)) {
+// log.error("瑙勬牸鍨嬪彿涓虹┖");
+// return 0;
+// }
+// int flag5 = 0;
+// int number = -1; //鍑哄簱鍚庯紝鐗╁搧鍓╀綑鏁伴噺
+// for (LWhGoodsRecord record : recordList) {
+// //鐗╁搧id鍜岀墿鍝佸悕绉�
+// record.setBaseGoodsTemplateId(param.getBaseGoodsTemplateId());
+// record.setGoodsTemplateName(param.getGoodsTemplateName());
+//
+// record.setId(IdUtil.generateId());
+// record.setWarehouseId(warehouseId);
+// //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
+// int goodsNum = this.lWhGoodsService.queryGoodsModelNum(warehouseId, record.getBaseGoodsModelsId(), (short) 1, null);
+// record.setInitialCount(goodsNum);
+// record.setThisType(2);
+//
+// //鍒ゆ柇鍑哄簱鏁伴噺鏄惁灏忎簬搴撳瓨
+// number = goodsNum - record.getThisCount();
+// if (number < 0) {
+// log.error("搴撳瓨涓嶈冻");
+// break;
+// }
+// record.setEndCount(number);
+// record.setDealTime(dateTimeNumber);
+// record.setWarehouseFlowId(lWarehouseFlowId);
+//
+// //5.鏂板L_WH_PROCURE_MODEL璁板綍
+// LWhProcureModel lWhProcureModel = new LWhProcureModel();
+// lWhProcureModel.setId(IdUtil.generateId());
+// lWhProcureModel.setBusinessType(3);
+// lWhProcureModel.setBaseGoodsModelsId(record.getBaseGoodsModelsId());
+// lWhProcureModel.setCounts(record.getThisCount());
+// lWhProcureModel.setWorehouseCount(goodsNum);
+// int res = this.lWhProcureModelService.insert(lWhProcureModel);
+// flag5 += res;
+// }
+// //濡傛灉鍑哄簱鍚庯紝鍓╀綑搴撳瓨澶т簬0锛屾柊澧瀕_wh_goods_record璁板綍
+// int flag4 = 0;
+// if (number >= 0){
+// flag4 = this.lWhGoodsService.insert(recordList);
+// }
+//
+// //濡傛灉鏈変竴鏉¤褰曟柊澧炲け璐ワ紝鍒欏洖婊�
+// if (flag1 == 0 || flag3 == 0 || flag4 != recordList.size() || flag5 != recordList.size() || number < 0) {
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return 0;
+// }
+//
+// return 1;
+// }
+
+ /**
+ * @Description 鏂板鍑哄簱鍗�
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/27
+ */
+ public int add(LWhFormOutputParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
+ //1.鏂板鍑哄簱鍗曡褰�
+ LWhFormOutput lWhFormOutput = new LWhFormOutput();
+ //鍑哄叆搴搃d
+ long lWhFormOutputId = IdUtil.generateId();
+ lWhFormOutput.setId(lWhFormOutputId);
+ Long warehouseId = param.getWarehouseId();
+ lWhFormOutput.setWarehouseId(warehouseId);
+ //鏍规嵁浠撳簱id鏌ヨ浠撳簱
+ BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId);
+ if (warehouse == null) {
+ log.error("浠撳簱id涓嶅瓨鍦�");
+ return 0;
+ }
+ lWhFormOutput.setWarehouseName(warehouse.getWarehouseName());
+ lWhFormOutput.setOutputCode(BaseWarehouseParam1.In_OutPutTypeEnum.Fragmentary_Output.getValue() + "");
+ lWhFormOutput.setOutputName("闆舵槦鍑哄簱");
+ lWhFormOutput.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
+ lWhFormOutput.setAgencyName(sysInfo.getTenantName());
+ lWhFormOutput.setOperatorId(sysInfo.getId());
+ lWhFormOutput.setOperatorName(sysInfo.getUserName());
+ long dateTimeNumber = DateUtils.getDateTimeNumber(System.currentTimeMillis());
+ lWhFormOutput.setDealTime(dateTimeNumber);
+ lWhFormOutput.setStates(1);
+ int flag1 = this.insert(lWhFormOutput);
+
+ //4.鏂板l_wh_goods_record璁板綍
+ List<LWhGoodsRecord> recordList = param.getList();
+ if (CollectionUtils.isEmpty(recordList)) {
+ log.error("瑙勬牸鍨嬪彿涓虹┖");
+ return 0;
+ }
+ int flag5 = 0;
+ for (LWhGoodsRecord record : recordList) {
+ //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(warehouseId, record.getBaseGoodsModelsId(), (short) 1, null);
+
+ //5.鏂板L_WH_PROCURE_MODEL璁板綍
+ LWhProcureModel lWhProcureModel = new LWhProcureModel();
+ lWhProcureModel.setId(IdUtil.generateId());
+ lWhProcureModel.setBusinessType(3);
+ lWhProcureModel.setBaseGoodsModelsId(record.getBaseGoodsModelsId());
+ lWhProcureModel.setCounts(record.getThisCount());
+ lWhProcureModel.setWorehouseCount(goodsNum);
+ int res = this.lWhProcureModelService.insert(lWhProcureModel);
+ flag5 += res;
+ }
+
+ //2.鏍规嵁鍑哄簱鍗曞嚭搴�
+ Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutput.getId(), currentUser, dateTimeNumber);
+ //3.鍚戝嚭搴撳崟 鎻掑叆 杩涘嚭搴撴祦姘存�昏〃ID
+ int flag3 = 0;
+ if (flag1 > 0) {
+ LWhFormOutput lWhFormOutput1 = new LWhFormOutput(lWhFormOutputId);
+ lWhFormOutput1.setWarehouseFlowId(lWarehouseFlowId);
+ flag3 = this.update(lWhFormOutput1);
+ }
+
+ //濡傛灉鏈変竴鏉¤褰曟柊澧炲け璐ワ紝鍒欏洖婊�
+ if (flag1 == 0 || flag3 == 0 || flag5 != recordList.size()) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return 0;
+ }
+
+ return 1;
+ }
+}
--
Gitblit v1.9.1