From 5e6c61b8753870ef2f8cde60eef47e3eeefe89e6 Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期四, 02 十一月 2023 17:35:48 +0800
Subject: [PATCH] 报废单 相关代码
---
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java | 230 +++++++++++++++
consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputGoodsParams.java | 49 +++
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 19 +
consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedExtend.java | 26 +
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 60 ++-
consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputParam.java | 11
consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedParam.java | 107 +++++++
consum-base/src/main/java/com/consum/base/pojo/LWhFormTransferExtend.java | 24 +
consum-base/src/main/java/com/consum/base/service/SDictDataServiceImpl.java | 30 ++
consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java | 108 +++++++
consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java | 8
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 10
consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputInsertParam.java | 51 +++
consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java | 5
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java | 13
consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java | 39 ++
consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java | 12
17 files changed, 734 insertions(+), 68 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
index a1eb96a..3216db6 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
@@ -7,6 +7,7 @@
import com.consum.base.service.BaseGoodsTemplateServiceImpl;
import com.consum.model.po.BaseCategory;
import com.consum.model.po.BaseGoodsModels;
+import com.consum.model.po.BaseGoodsTemplate;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
@@ -98,6 +99,17 @@
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
}
+ /**
+ * @Description 鏍规嵁鐗╁搧id鏌ヨ瑙勬牸鍨嬪彿
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/30
+ */
+ @GetMapping("/selectByGoodsTemplatesId")
+ public ResponseValue queryByGoodsTemplatesId(Long goodsTemplatesId) {
+ List<BaseGoodsModels> list = this.baseGoodsModelsService.queryByGoodsTemplatesId(goodsTemplatesId);
+ return ResponseValue.success(list);
+ }
+
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
index 1200252..bf18cec 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
@@ -26,11 +26,6 @@
@Resource
private LWarehouseFlowService lWarehouseFlowService;
- /**
- * 鍑哄叆搴撴槑缁�
- * @param param
- * @return
- */
@GetMapping("/list")
public ResponseValue queryFormProcureList(LWarehouseFlowParam param) {
S_user_core currentUser = this.getCurrentUser();
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
index 00ae434..a4b1079 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -4,6 +4,7 @@
import com.consum.base.pojo.*;
import com.consum.base.service.BaseCategoryServiceImpl;
import com.consum.base.service.LWhFormOutputServiceImpl;
+import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;
import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
@@ -32,6 +33,8 @@
private LWhFormOutputServiceImpl lWhFormOutputService;
@Autowired
private LWhProcureModelService lWhProcureModelService;
+ @Autowired
+ private LWhGoodsService lWhGoodsService;
/**
* @Description 鏂板鍑哄簱鍗�
@@ -39,7 +42,7 @@
* @Date 2023/10/27
*/
@PostMapping("/add")
- public ResponseValue add(@RequestBody LWhFormOutputParam param) {
+ public ResponseValue add(@RequestBody LWhFormOutputInsertParam param) {
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -112,6 +115,20 @@
return ResponseValue.success("鏌ヨ鎴愬姛!", formOutputExtend);
}
+ /**
+ * @Description 鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/2
+ */
+ @GetMapping("/select/number")
+ public ResponseValue selectNumber(Long warehouseId,Long baseGoodsModelsId) {
+ if (warehouseId == null || baseGoodsModelsId == null) {
+ return ResponseValue.error("鍙傛暟閿欒");
+ }
+ int num = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1,null);
+ return ResponseValue.success(num);
+ }
+
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
index 2747e39..6e6c912 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
@@ -1,17 +1,24 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
-import com.consum.base.pojo.LWhFormInventoryParam;
-import com.consum.base.pojo.LWhFormScrappedParam;
+import com.consum.base.pojo.*;
+import com.consum.base.service.LWhFormScrappedGoodsService;
import com.consum.base.service.LWhFormScrappedServiceImpl;
-import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.*;
+import com.consum.model.vo.LWhFormOutputVo;
+import com.consum.model.vo.LWhFormTransferVo;
import com.iplatform.model.po.S_user_core;
+import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.web.ResponseValue;
+import org.springframework.beans.BeanUtils;
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;
+import org.springframework.web.bind.annotation.*;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
/**
* @Description 鎶ュ簾鍗�
@@ -24,6 +31,8 @@
@Autowired
private LWhFormScrappedServiceImpl lWhFormScrappedService;
+ @Autowired
+ private LWhFormScrappedGoodsService scrappedGoodsService;
/**
* @Description 鏂板鎶ュ簾鍗�
@@ -32,15 +41,94 @@
*/
@PostMapping("/add")
public ResponseValue add(@RequestBody LWhFormScrappedParam param) {
- //鏍规嵁鐩樼偣浜篿d鏌ヨ鐩樼偣浜�
- S_user_core operatorUser = this.getUser(param.getOperatorId());
FinSysTenantUser sysInfo = this.getSysInfo();
- int result = this.lWhFormScrappedService.add(param, sysInfo,operatorUser);
+ int result = this.lWhFormScrappedService.add(param, this.getCurrentUser(),sysInfo);
if (result > 0) return ResponseValue.success(1);
return ResponseValue.error("鏂板澶辫触锛�");
}
+ /**
+ * @Description 鍒楄〃鏌ヨ
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/02
+ */
+ //1.鏌ヨ鎶ュ簾鍗�
+ //2.鏌ヨ鎶ュ簾鍗曠墿鍝�
+ @GetMapping("/list")
+ public ResponseValue queryList(LWhFormScrappedParam param) {
+ FinSysTenantUser sysInfo = getSysInfo();
+ if (sysInfo == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ GenericPager genericPager = lWhFormScrappedService.queryList(param,sysInfo);
+ List<LWhFormScrapped> datas = genericPager.getDatas();
+ ArrayList<LWhFormScrappedExtend> newDatas = new ArrayList<>();
+ if (!CollectionUtils.isEmpty(datas)) {
+ datas.forEach(item -> {
+ // 鏌ヨ鎶ュ簾鍗曠墿鍝�
+ LWhFormScrappedGoods scrappedGoods = new LWhFormScrappedGoods();
+ scrappedGoods.setFormScrappedId(item.getId());
+ List<LWhFormScrappedGoods> scrappedGoodsList = scrappedGoodsService.select(scrappedGoods);
+ LWhFormScrappedExtend formScrappedExtend = new LWhFormScrappedExtend();
+ BeanUtils.copyProperties(item, formScrappedExtend);
+ formScrappedExtend.setScrappedGoodsList(scrappedGoodsList);
+ newDatas.add(formScrappedExtend);
+ });
+ }
+ try {
+ Field fieldDatas = GenericPager.class.getDeclaredField("datas");
+ fieldDatas.setAccessible(true);
+ fieldDatas.set(genericPager, newDatas);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+// genericPager.setDatas(newDatas);
+ return ResponseValue.success(genericPager);
+ }
+
+ /**
+ * @Description 鏍规嵁id鏌ヨ璇︽儏
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/2
+ */
+ @GetMapping("/detail")
+ public ResponseValue getById(Long id) {
+ if (id == null) {
+ return ResponseValue.error("鎶ュ簾鍗昳d涓虹┖");
+ }
+ LWhFormScrappedExtend scrappedExtend = this.lWhFormScrappedService.getById(id);
+ return ResponseValue.success(scrappedExtend);
+ }
+
+ /**
+ * 鎶ュ簾鏄庣粏
+ * @param param
+ * @return
+ */
+ @GetMapping("/list/detailList")
+ public ResponseValue queryDetailList(LWhFormScrappedParam param) {
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ GenericPager<Map<String, Object>> genericPager = lWhFormScrappedService.queryDetailList(param,sysInfo);
+ return ResponseValue.success(genericPager);
+ }
+
+ /**
+ * @Description 瀵煎嚭鎶ュ簾鐧昏鍗�
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/2
+ */
+ @GetMapping("/export")
+ public ResponseValue export(Long id) {
+ if (id == null) {
+ return ResponseValue.error("鎶ュ簾鍗昳d涓虹┖");
+ }
+ LWhFormScrappedExtend scrappedExtend = this.lWhFormScrappedService.export(id,this.getSysInfo());
+ return ResponseValue.success(scrappedExtend);
+ }
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index d58d8d1..d8b2204 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -81,7 +81,7 @@
GenericPager genericPager = lWhFormTransferService.queryFormTransferList(param);
List<LWhFormTransfer> datas = genericPager.getDatas();
- ArrayList<LWhFormProcureExtend> newDatas = new ArrayList<>();
+ ArrayList<LWhFormTransferExtend> newDatas = new ArrayList<>();
if (!CollectionUtils.isEmpty(datas)) {
datas.forEach(item -> {
// 鏌ヨ鍨嬪彿鏁伴噺
@@ -89,10 +89,10 @@
lWhProcureModel.setBusinessType(2);
lWhProcureModel.setBusinessId(item.getId());
List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel);
- LWhFormProcureExtend formProcureExtend = new LWhFormProcureExtend();
- BeanUtils.copyProperties(item, formProcureExtend);
- formProcureExtend.setModels(models);
- newDatas.add(formProcureExtend);
+ LWhFormTransferExtend formTransferExtend = new LWhFormTransferExtend();
+ BeanUtils.copyProperties(item, formTransferExtend);
+ formTransferExtend.setModels(models);
+ newDatas.add(formTransferExtend);
});
}
try {
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java b/consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java
index 727d7fa..e3d6e9a 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java
@@ -11,10 +11,10 @@
**/
public class LWarehouseFlowParam extends ParamRequest {
- //鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂
+ //鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂 5鎶ュ簾
private Short businessType;
// 涓氬姟鍗曟嵁缂栧彿
- private Long businessFormCode;
+ private String businessFormCode;
//鐗╁搧鍚嶇О
private String goodsTemplateName;
//瑙勬牸鍨嬪彿
@@ -38,11 +38,11 @@
this.businessType = businessType;
}
- public Long getBusinessFormCode() {
+ public String getBusinessFormCode() {
return businessFormCode;
}
- public void setBusinessFormCode(Long businessFormCode) {
+ public void setBusinessFormCode(String businessFormCode) {
this.businessFormCode = businessFormCode;
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputGoodsParams.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputGoodsParams.java
new file mode 100644
index 0000000..9ef8062
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputGoodsParams.java
@@ -0,0 +1,49 @@
+package com.consum.base.pojo;
+
+import com.walker.web.param.ParamRequest;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/2
+ */
+public class LWhFormOutputGoodsParams extends ParamRequest {
+ /**
+ * 璁板綍鐗╁搧淇℃伅鍜岃鏍煎瀷鍙�
+ */
+ private List<LWhProcureModelParams> models;
+ /**
+ * 鐗╁搧id
+ */
+ private Long baseGoodsTemplateId;
+ /**
+ * 鐗╁搧妯＄増鍚嶇О
+ */
+ private String goodsTemplateName;
+
+ public List<LWhProcureModelParams> getModels() {
+ return models;
+ }
+
+ public void setModels(List<LWhProcureModelParams> models) {
+ this.models = models;
+ }
+
+ 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/pojo/LWhFormOutputInsertParam.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputInsertParam.java
new file mode 100644
index 0000000..8a0f422
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputInsertParam.java
@@ -0,0 +1,51 @@
+package com.consum.base.pojo;
+
+import com.walker.web.param.ParamRequest;
+
+import java.util.List;
+
+/**
+ * @Description 鏂板鍑哄簱鍗曞弬鏁�
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/27
+ */
+public class LWhFormOutputInsertParam extends ParamRequest {
+ /**
+ * 浠撳簱id
+ */
+ private Long warehouseId;
+ /**
+ * 鍑哄簱鏃堕棿
+ */
+ private Long dealTime;
+ /**
+ * 璁板綍鐗╁搧淇℃伅鍜岃鏍煎瀷鍙�
+ */
+ private List<LWhFormOutputGoodsParams> goods;
+
+
+
+ public Long getWarehouseId() {
+ return warehouseId;
+ }
+
+ public void setWarehouseId(Long warehouseId) {
+ this.warehouseId = warehouseId;
+ }
+
+ public Long getDealTime() {
+ return dealTime;
+ }
+
+ public void setDealTime(Long dealTime) {
+ this.dealTime = dealTime;
+ }
+
+ public List<LWhFormOutputGoodsParams> getGoods() {
+ return goods;
+ }
+
+ public void setGoods(List<LWhFormOutputGoodsParams> goods) {
+ this.goods = goods;
+ }
+}
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
index 8dc72c8..d39fffc 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputParam.java
@@ -1,10 +1,7 @@
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;
/**
@@ -20,9 +17,7 @@
/**
* 鍑哄簱鏃堕棿
*/
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDate dealTime;
-
+ private Long dealTime;
/**
* 璁板綍鐗╁搧淇℃伅鍜岃鏍煎瀷鍙�
*/
@@ -69,11 +64,11 @@
this.warehouseId = warehouseId;
}
- public LocalDate getDealTime() {
+ public Long getDealTime() {
return dealTime;
}
- public void setDealTime(LocalDate dealTime) {
+ public void setDealTime(Long dealTime) {
this.dealTime = dealTime;
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedExtend.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedExtend.java
new file mode 100644
index 0000000..dff99b7
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedExtend.java
@@ -0,0 +1,26 @@
+package com.consum.base.pojo;
+
+import com.consum.model.po.LWhFormProcure;
+import com.consum.model.po.LWhFormScrapped;
+import com.consum.model.po.LWhFormScrappedGoods;
+import com.consum.model.po.LWhProcureModel;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/2
+ */
+public class LWhFormScrappedExtend extends LWhFormScrapped {
+
+ private List<LWhFormScrappedGoods> scrappedGoodsList;
+
+ public List<LWhFormScrappedGoods> getScrappedGoodsList() {
+ return scrappedGoodsList;
+ }
+
+ public void setScrappedGoodsList(List<LWhFormScrappedGoods> scrappedGoodsList) {
+ this.scrappedGoodsList = scrappedGoodsList;
+ }
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedParam.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedParam.java
index fbca514..d014bd5 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedParam.java
@@ -6,6 +6,9 @@
import java.util.List;
public class LWhFormScrappedParam extends ParamRequest {
+
+ //鏂板鍙傛暟
+
/**
* 鏈烘瀯id
*/
@@ -29,12 +32,114 @@
/**
* 鐗╁搧id
*/
-
+ private Long baseGoodsTemplateId;
/**
* 鎶ュ簾鍗曠墿鍝�
*/
private List<LWhFormScrappedGoodsParams> scrappedGoodsList;
+ //鏌ヨ鍙傛暟
+
+ /**
+ * 鎶ュ簾鍗曞彿
+ */
+ private String businessFormCode;
+ /**
+ * 鐗╁搧妯＄増鍚嶇О
+ */
+ private String goodsTemplateName;
+ /**
+ * 鎶ュ簾鏃堕棿 寮�濮�
+ */
+ private Long dealTimeStart;
+ /**
+ * 鎶ュ簾鏃堕棿 缁撴潫
+ */
+ private Long dealTimeEnd;
+ /**
+ * 瑙勬牸鍨嬪彿id
+ */
+ private Long baseGoodsModelsId;
+ /**
+ * 鍒涘缓浜�
+ */
+ private String operatorName;
+
+ private Integer pageSize = 10;
+ private Integer pageNum = 1;
+
+ public Integer getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(Integer pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public Integer getPageNum() {
+ return pageNum;
+ }
+
+ public void setPageNum(Integer pageNum) {
+ this.pageNum = pageNum;
+ }
+
+ public String getOperatorName() {
+ return operatorName;
+ }
+
+ public void setOperatorName(String operatorName) {
+ this.operatorName = operatorName;
+ }
+
+ public Long getBaseGoodsModelsId() {
+ return baseGoodsModelsId;
+ }
+
+ public void setBaseGoodsModelsId(Long baseGoodsModelsId) {
+ this.baseGoodsModelsId = baseGoodsModelsId;
+ }
+
+ public String getBusinessFormCode() {
+ return businessFormCode;
+ }
+
+ public void setBusinessFormCode(String businessFormCode) {
+ this.businessFormCode = businessFormCode;
+ }
+
+ public String getGoodsTemplateName() {
+ return goodsTemplateName;
+ }
+
+ public void setGoodsTemplateName(String goodsTemplateName) {
+ this.goodsTemplateName = goodsTemplateName;
+ }
+
+ public Long getDealTimeStart() {
+ return dealTimeStart;
+ }
+
+ public void setDealTimeStart(Long dealTimeStart) {
+ this.dealTimeStart = dealTimeStart;
+ }
+
+ public Long getDealTimeEnd() {
+ return dealTimeEnd;
+ }
+
+ public void setDealTimeEnd(Long dealTimeEnd) {
+ this.dealTimeEnd = dealTimeEnd;
+ }
+
+ public Long getBaseGoodsTemplateId() {
+ return baseGoodsTemplateId;
+ }
+
+ public void setBaseGoodsTemplateId(Long baseGoodsTemplateId) {
+ this.baseGoodsTemplateId = baseGoodsTemplateId;
+ }
+
public Long getAgencyId() {
return agencyId;
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormTransferExtend.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormTransferExtend.java
new file mode 100644
index 0000000..396a180
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormTransferExtend.java
@@ -0,0 +1,24 @@
+package com.consum.base.pojo;
+
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.LWhProcureModel;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/2
+ */
+public class LWhFormTransferExtend extends LWhFormTransfer {
+
+ private List<LWhProcureModel> models;
+
+ public List<LWhProcureModel> getModels() {
+ return models;
+ }
+
+ public void setModels(List<LWhProcureModel> models) {
+ this.models = models;
+ }
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java
index d0513ee..4558e52 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java
@@ -10,8 +10,10 @@
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import java.util.HashMap;
+import java.util.List;
/**
* @Description 鐗╁搧妯℃澘
@@ -86,4 +88,41 @@
models.setStates(Constants.STATES_DELETED);
return this.update(models);
}
+
+ /**
+ * @Description 鏍规嵁瑙勬牸鍨嬪彿id鏌ヨ瑙勬牸鍨嬪彿
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/2
+ * @param idList
+ */
+ public List<BaseGoodsModels> selectByModelsIdList(List<Long> idList) {
+ if (CollectionUtils.isEmpty(idList)) {
+ log.error("鍙傛暟閿欒");
+ return null;
+ }
+ StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_models WHERE 1 = 1 ");
+ HashMap<String, Object> paramts = new HashMap<>();
+
+ sql.append(" and id in ( ");
+ for (int i = 0; i < idList.size(); i++) {
+ sql.append(idList.get(i));
+ if (i < idList.size() - 1) {
+ sql.append(",");
+ }
+ }
+ sql.append(" ) ");
+
+ return this.select(sql.toString(), paramts, new BaseGoodsModels());
+ }
+
+ /**
+ * @Description 鏍规嵁鐗╁搧id鏌ヨ瑙勬牸鍨嬪彿
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/30
+ */
+ public List<BaseGoodsModels> queryByGoodsTemplatesId(Long goodsTemplatesId) {
+ BaseGoodsModels baseGoodsModels = new BaseGoodsModels();
+ baseGoodsModels.setGoodsTemplatesId(goodsTemplatesId);
+ return this.select(baseGoodsModels);
+ }
}
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
index 7be440f..5c038cb 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
@@ -3,8 +3,7 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.param.BaseWarehouseParam1;
-import com.consum.base.pojo.LWhFormOutputParam;
-import com.consum.base.pojo.LWhProcureModelParams;
+import com.consum.base.pojo.*;
import com.consum.base.util.IdUtil;
import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
@@ -41,6 +40,8 @@
private LWhProcureModelService lWhProcureModelService;
@Autowired
private LWhFormOutputCoreService lWhFormOutputCoreService;
+ @Autowired
+ private BaseGoodsModelsServiceImpl baseGoodsModelsService;
private static String QUERY_FORM_OUTPUT_LIST = "SELECT * FROM l_wh_form_output WHERE 1 = 1";
@@ -146,7 +147,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
- public int add(LWhFormOutputParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
+ public int add(LWhFormOutputInsertParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
//1.鏂板鍑哄簱鍗曡褰�
LWhFormOutput lWhFormOutput = new LWhFormOutput();
//鍑哄叆搴搃d
@@ -168,8 +169,7 @@
lWhFormOutput.setAgencyName(sysInfo.getTenantName());
lWhFormOutput.setOperatorId(sysInfo.getId());
lWhFormOutput.setOperatorName(sysInfo.getUserName());
- long dateTimeNumber = DateUtils.getDateTimeNumber(System.currentTimeMillis());
- lWhFormOutput.setDealTime(dateTimeNumber);
+ lWhFormOutput.setDealTime(param.getDealTime());
lWhFormOutput.setStates(1);
int flag1 = this.insert(lWhFormOutput);
if (flag1 == 0) {
@@ -177,27 +177,43 @@
return 0;
}
//2.鏂板鐗╁搧鍨嬪彿璁板綍
- List<LWhProcureModelParams> models = param.getModels();
- List<LWhProcureModel> modelList = new ArrayList<>();
- for (LWhProcureModelParams model : models) {
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- lWhProcureModel.setId(IdUtil.generateId());
- lWhProcureModel.setBusinessType(3);
- lWhProcureModel.setBusinessId(lWhFormOutputId);
- lWhProcureModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId());
- //lWhProcureModel.se
- lWhProcureModel.setCounts(model.getCounts());
- //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0,warehouseId, model.getBaseGoodsModelsId(), (short) 1, null);
- lWhProcureModel.setWorehouseCount(goodsNum);
- modelList.add(lWhProcureModel);
+ List<LWhFormOutputGoodsParams> goodsList = param.getGoods();
+ for (LWhFormOutputGoodsParams goods : goodsList) {
+ List<LWhProcureModelParams> models = goods.getModels();
+ List<LWhProcureModel> modelList = new ArrayList<>();
+ for (LWhProcureModelParams model : models) {
+ LWhProcureModel lWhProcureModel = new LWhProcureModel();
+ lWhProcureModel.setId(IdUtil.generateId());
+ lWhProcureModel.setBusinessType(3);
+ lWhProcureModel.setBusinessId(lWhFormOutputId);
+ lWhProcureModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId());
+ //鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿
+ BaseGoodsModels baseGoodsModels = this.baseGoodsModelsService.get(new BaseGoodsModels(model.getBaseGoodsModelsId()));
+ if (baseGoodsModels != null) {
+ lWhProcureModel.setBaseGoodsModelsName(baseGoodsModels.getModelName());
+ }
+ lWhProcureModel.setCounts(model.getCounts());
+ //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0,warehouseId, model.getBaseGoodsModelsId(), (short) 1, null);
+ lWhProcureModel.setWorehouseCount(goodsNum);
+ modelList.add(lWhProcureModel);
+ }
+ int flag2 = this.lWhProcureModelService.insert(modelList);
+ if (flag2 != modelList.size()) {
+ log.error("鏂板鐗╁搧鍨嬪彿澶辫触");
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return 0;
+ }
}
- int flag2 = this.lWhProcureModelService.insert(modelList);
- if (flag2 != modelList.size()) {
- log.error("鏂板鐗╁搧鍨嬪彿澶辫触");
+
+ //3.鏍规嵁鍑哄簱鍗曞嚭搴�
+ Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, currentUser, param.getDealTime());
+ if (lWarehouseFlowId == null) {
+ log.error("鏍规嵁鍑哄簱鍗曞嚭搴撳け璐�");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return 0;
}
+
return 1;
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java
index 49e807a..72b3f04 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java
@@ -1,7 +1,10 @@
package com.consum.base.service;
+import com.consum.model.po.LWhFormScrappedGoods;
import com.walker.jdbc.service.BaseServiceImpl;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* @ClassName LWhFormScrappedGoodsService
@@ -13,4 +16,14 @@
@Service
public class LWhFormScrappedGoodsService extends BaseServiceImpl {
+ /**
+ * @Description 鏍规嵁鎶ュ簾鍗昳d鏌ヨ鎶ュ簾鍗曠墿鍝�
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/2
+ */
+ public List<LWhFormScrappedGoods> getByFormScrappedId(Long id) {
+ LWhFormScrappedGoods scrappedGoods = new LWhFormScrappedGoods();
+ scrappedGoods.setFormScrappedId(id);
+ return this.select(scrappedGoods);
+ }
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
index 7601f0a..59f876e 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
@@ -2,19 +2,26 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
-import com.consum.base.pojo.LWhFormScrappedGoodsParams;
-import com.consum.base.pojo.LWhFormScrappedParam;
-import com.consum.base.pojo.LWhProcureModelParams;
+import com.consum.base.core.tools.MapRowMapper;
+import com.consum.base.pojo.*;
import com.consum.base.util.IdUtil;
import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
+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;
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.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @Description 鎶ュ簾鍗�
@@ -33,22 +40,43 @@
private LWhGoodsService lWhGoodsService;
@Autowired
private LWhFormScrappedGoodsService scrappedGoodsService;
+ @Autowired
+ private SDictDataServiceImpl sDictDataService;
+ @Autowired
+ private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+ @Autowired
+ private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ @Autowired
+ private LWhFormScrappedCoreService lWhFormScrappedCoreService;
+
+ private static String QUERY_LIST = "SELECT * FROM l_wh_form_scrapped WHERE 1 = 1";
+
+ private static final String QUERY_BF_DETAIL_LIST = "select lwfs.BUSINESS_FORM_CODE,\n" +
+ " lwfsg.GOODS_TEMPLATE_NAME,\n" +
+ " lwfsg.BASE_GOODS_MODELS_NAME,\n" +
+ " lwfsg.COUNTS,\n" +
+ " lwfs.AGENCY_NAME,\n" +
+ " lwfs,OPERATOR_NAME,\n" +
+ " lwfs,DEAL_TIME\n" +
+ "from l_wh_form_scrapped lwfs\n" +
+ " inner join l_wh_form_scrapped_goods lwfsg on lwfs.ID = lwfsg.FORM_SCRAPPED_ID ";
/**
* 鏂板
+ *
* @param param
- * @param sysInfo
- * @param operatorUser
+ * @param currentUser 褰撳墠鐧诲綍鐢ㄦ埛
+ * @param sysInfo 褰撳墠鐧诲綍鐢ㄦ埛
* @return
*/
//1.鏂板鎶ュ簾鍗�
//2.鏂板鎶ュ簾鍗曠墿鍝�
- public int add(LWhFormScrappedParam param, FinSysTenantUser sysInfo, S_user_core operatorUser) {
+ public int add(LWhFormScrappedParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
//1.鏂板鎶ュ簾鍗曡褰�
LWhFormScrapped lWhFormScrapped = new LWhFormScrapped();
- //璋冩嫧鍗昳d
- long lWhFormTransferId = IdUtil.generateId();
- lWhFormScrapped.setId(lWhFormTransferId);
+ //鎶ュ簾鍗昳d
+ long lWhFormScrappedId = IdUtil.generateId();
+ lWhFormScrapped.setId(lWhFormScrappedId);
lWhFormScrapped.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Scrapped));
lWhFormScrapped.setWarehouseType(0);
Long warehouseId = param.getWarehouseId();
@@ -78,28 +106,206 @@
return 0;
}
//2.鏂板鎶ュ簾鍗曠墿鍝佽褰�
+ //鏍规嵁鐗╁搧id鏌ヨ鐗╁搧
+ BaseGoodsTemplate goodsTemplate = this.baseGoodsTemplateService.get(new BaseGoodsTemplate(param.getBaseGoodsTemplateId()));
+ if (goodsTemplate == null) {
+ log.error("鏍规嵁鐗╁搧id鏌ヨ鐗╁搧");
+ return 0;
+ }
List<LWhFormScrappedGoodsParams> scrappedGoodsParamList = param.getScrappedGoodsList();
+ if (CollectionUtils.isEmpty(scrappedGoodsParamList)) {
+ log.error("鏂板鎶ュ簾鍗曠墿鍝佽褰� 澶辫触");
+ return 0;
+ }
+ //鑾峰彇瑙勬牸鍨嬪彿id
+ List<Long> baseGoodsModelsIdList = scrappedGoodsParamList.stream().map(params -> params.getBaseGoodsModelsId()).collect(Collectors.toList());
+ //鏍规嵁瑙勬牸鍨嬪彿id鏌ヨ瑙勬牸鍨嬪彿
+ List<BaseGoodsModels> models = this.baseGoodsModelsService.selectByModelsIdList(baseGoodsModelsIdList);
+ Map<Long, BaseGoodsModels> modelMap = models.stream().collect(Collectors.toMap(model -> model.getId(), model -> model));
+ //鑾峰彇鎶ュ簾鍘熷洜code
+ List<String> scrappedCodeList = scrappedGoodsParamList.stream().map(params -> params.getScrappedCode()).collect(Collectors.toList());
+ //鏍规嵁鎶ュ簾鍘熷洜code鏌ヨ鏁版嵁瀛楀吀
+ List<S_dict_data> s_dict_dataList = this.sDictDataService.selectByScrappedCodeList(scrappedCodeList);
+ Map<Long, String> scrappedNameMap = s_dict_dataList.stream().collect(Collectors.toMap(s -> s.getDict_code(), s -> s.getDict_label()));
+
List<LWhFormScrappedGoods> scrappedGoodsList = new ArrayList<>();
for (LWhFormScrappedGoodsParams params : scrappedGoodsParamList) {
LWhFormScrappedGoods scrappedGoods = new LWhFormScrappedGoods();
scrappedGoods.setId(IdUtil.generateId());
//鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0,warehouseId, scrappedGoods.getBaseGoodsModelsId(), (short) 1, null);
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, scrappedGoods.getBaseGoodsModelsId(), (short) 1, null);
if (params.getCounts() > goodsNum) {
log.error("鎶ュ簾鏁伴噺澶т簬搴撳瓨鏁伴噺");
return 0;
}
scrappedGoods.setCounts(params.getCounts());
+ //鎶ュ簾鍘熷洜
scrappedGoods.setScrappedCode(params.getScrappedCode());
- //TODO 鎶ュ簾鍘熷洜
+ scrappedGoods.setScrappedName(scrappedNameMap.get(Long.valueOf(params.getScrappedCode())));
+ scrappedGoods.setFormScrappedId(lWhFormScrappedId);
+ //鐗╁搧妯℃澘
+ scrappedGoods.setBaseGoodsTemplateId(goodsTemplate.getId());
+ scrappedGoods.setGoodsTemplateName(goodsTemplate.getGoodsName());
+ //瑙勬牸鍨嬪彿
+ Long baseGoodsModelsId = params.getBaseGoodsModelsId();
+ BaseGoodsModels baseGoodsModels = modelMap.get(baseGoodsModelsId);
+ if (baseGoodsModels != null) {
+ scrappedGoods.setBaseGoodsModelsId(baseGoodsModelsId);
+ scrappedGoods.setBaseGoodsModelsName(baseGoodsModels.getModelName());
+ scrappedGoods.setUnit(baseGoodsModels.getUnit());
+ }
+
scrappedGoodsList.add(scrappedGoods);
}
int flag2 = this.scrappedGoodsService.insert(scrappedGoodsList);
if (flag2 != scrappedGoodsList.size()) {
- log.error("鏂板鎶ュ簾鍗曠墿鍝佽褰�");
+ log.error("鏂板鎶ュ簾鍗曠墿鍝佽褰� 澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return 0;
}
+ //3.鏍规嵁鎶ュ簾鍗曟姤搴熺墿鍝�
+ Long lWarehouseFlowId = this.lWhFormScrappedCoreService.outFormByTransId(lWhFormScrappedId, currentUser, param.getDealTime());
+ if (lWarehouseFlowId == null) {
+ log.error("鏍规嵁鍑哄簱鍗曞嚭搴� 澶辫触");
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return 0;
+ }
+
return 1;
}
+
+ /**
+ * @Description 鍒楄〃鏌ヨ
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/2
+ */
+ public GenericPager queryList(LWhFormScrappedParam param, FinSysTenantUser sysInfo) {
+ HashMap<String, Object> paramts = new HashMap<>();
+ StringBuilder sql = new StringBuilder(QUERY_LIST);
+ //鎶ュ簾鍗曞彿
+ if (!StringUtils.isEmpty(param.getBusinessFormCode())) {
+ sql.append(" and BUSINESS_FORM_CODE like :businessFormCode ");
+ paramts.put("businessFormCode", StringUtils.CHAR_PERCENT + param.getBusinessFormCode() + StringUtils.CHAR_PERCENT);
+ }
+ //鐗╁搧鍚嶇О
+ if (!StringUtils.isEmpty(param.getGoodsTemplateName())) {
+ sql.append(" AND id IN (SELECT BUSINESS_ID FROM L_WH_PROCURE_MODEL procureModel LEFT JOIN BASE_GOODS_MODELS baseModel ON procureModel.BASE_GOODS_MODELS_ID=baseModel.ID LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseModel.GOODS_TEMPLATES_ID=baseTemp.id WHERE procureModel.BUSINESS_TYPE=1 AND baseTemp.GOODS_NAME LIKE :goodsTemplateName)");
+ paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ }
+ //鏈烘瀯
+ sql.append(" and AGENCY_ID like :agencyId ");
+ if (param.getAgencyId() != null){
+ paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
+ } else {
+ paramts.put("agencyId", sysInfo.getTenantId() + StringUtils.CHAR_PERCENT);
+ }
+ //鎶ュ簾鏃堕棿
+ if (param.getDealTimeStart() != null) {
+ sql.append(" and DEAL_TIME >=:dealTimeStart ");
+ paramts.put("dealTimeStart", param.getDealTimeStart() * 1000000);
+ }
+ if (param.getDealTimeEnd() != null) {
+ sql.append(" and DEAL_TIME <:dealTimeEnd ");
+ paramts.put("dealTimeEnd", param.getDealTimeEnd() * 1000000 + 240000);
+ }
+
+ sql.append(" ORDER BY DEAL_TIME DESC");
+ GenericPager genericPager = selectSplit(sql.toString(), paramts, new LWhFormScrapped());
+ return genericPager;
+ }
+
+ /**
+ * @Description 鏍规嵁id鏌ヨ璇︽儏
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/2
+ */
+ public LWhFormScrappedExtend getById(Long id) {
+ LWhFormScrappedExtend scrappedExtend = new LWhFormScrappedExtend();
+ //1.鏌ヨ鎶ュ簾鍗�
+ LWhFormScrapped lWhFormScrapped = this.get(new LWhFormScrapped(id));
+ if (lWhFormScrapped != null) {
+ BeanUtils.copyProperties(lWhFormScrapped,scrappedExtend);
+ }
+ //2.鏌ヨ鎶ュ簾鍗�
+ List<LWhFormScrappedGoods> scrappedGoodsList = this.scrappedGoodsService.getByFormScrappedId(id);
+ if (!CollectionUtils.isEmpty(scrappedGoodsList)) {
+ scrappedExtend.setScrappedGoodsList(scrappedGoodsList);
+ }
+ return scrappedExtend;
+ }
+
+ /**
+ * 鎶ュ簾鏄庣粏
+ * @param param
+ * @return
+ */
+ public GenericPager<Map<String, Object>> queryDetailList(LWhFormScrappedParam param, FinSysTenantUser sysInfo) {
+ StringBuilder sql = new StringBuilder(QUERY_BF_DETAIL_LIST);
+ HashMap<String, Object> paramts = new HashMap<>();
+
+ //鎶ュ簾鍗曞彿
+ if (!StringUtils.isEmpty(param.getBusinessFormCode())) {
+ sql.append(" and BUSINESS_FORM_CODE =:BUSINESS_FORM_CODE ");
+ paramts.put("BUSINESS_FORM_CODE", StringUtils.CHAR_PERCENT + param.getBusinessFormCode() + StringUtils.CHAR_PERCENT);
+ }
+ //鐗╁搧鍚嶇О
+ if (!StringUtils.isEmpty(param.getGoodsTemplateName())) {
+ sql.append(" and GOODS_TEMPLATE_NAME =:GOODS_TEMPLATE_NAME ");
+ paramts.put("GOODS_TEMPLATE_NAME", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ }
+ //瑙勬牸鍨嬪彿
+ if (param.getBaseGoodsModelsId() != null) {
+ sql.append(" and BASE_GOODS_MODELS_ID =:BASE_GOODS_MODELS_ID ");
+ paramts.put("BASE_GOODS_MODELS_ID", param.getBaseGoodsModelsId());
+ }
+ //鏈烘瀯
+ sql.append(" and AGENCY_ID like:AGENCY_ID ");
+ if (param.getAgencyId() != null) {
+ paramts.put("AGENCY_ID", param.getAgencyId() + StringUtils.CHAR_PERCENT);
+ } else {
+ paramts.put("AGENCY_ID", sysInfo.getTenantId() + StringUtils.CHAR_PERCENT);
+ }
+ //鍒涘缓浜�
+ if (!StringUtils.isEmpty(param.getOperatorName())) {
+ sql.append(" and OPERATOR_NAME =:OPERATOR_NAME ");
+ paramts.put("OPERATOR_NAME", StringUtils.CHAR_PERCENT + param.getOperatorName() + StringUtils.CHAR_PERCENT);
+ }
+
+ //缁撴潫鏃堕棿
+ if (param.getDealTimeStart() != null) {
+ sql.append(" and DEAL_TIME >=:dealTimeStart ");
+ paramts.put("dealTimeStart", param.getDealTimeStart() * 1000000);
+ }
+ if (param.getDealTimeEnd() != null) {
+ sql.append(" and DEAL_TIME <:dealTimeEnd ");
+ paramts.put("dealTimeEnd", param.getDealTimeEnd() * 1000000 + 240000);
+ }
+
+ sql.append(" ORDER BY DEAL_TIME DESC ");
+
+ return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapRowMapper());
+ }
+
+
+ /**
+ * @Description 瀵煎嚭鎶ュ簾鐧昏鍗�
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/2
+ */
+ public LWhFormScrappedExtend export(Long id, FinSysTenantUser sysInfo) {
+ LWhFormScrappedExtend scrappedExtend = new LWhFormScrappedExtend();
+ //1.鏌ヨ鎶ュ簾鍗�
+ LWhFormScrapped lWhFormScrapped = this.get(new LWhFormScrapped(id));
+ if (lWhFormScrapped != null) {
+ lWhFormScrapped.setDealTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+ lWhFormScrapped.setOperatorName(sysInfo.getUserName());
+ BeanUtils.copyProperties(lWhFormScrapped,scrappedExtend);
+ }
+ //2.鏌ヨ鎶ュ簾鍗曠墿鍝�
+ List<LWhFormScrappedGoods> scrappedGoodsList = this.scrappedGoodsService.getByFormScrappedId(id);
+ if (!CollectionUtils.isEmpty(scrappedGoodsList)) {
+ scrappedExtend.setScrappedGoodsList(scrappedGoodsList);
+ }
+ return scrappedExtend;
+ }
}
diff --git a/consum-base/src/main/java/com/consum/base/service/SDictDataServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/SDictDataServiceImpl.java
index 7c362d8..f895602 100644
--- a/consum-base/src/main/java/com/consum/base/service/SDictDataServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/SDictDataServiceImpl.java
@@ -1,9 +1,39 @@
package com.consum.base.service;
+import com.consum.model.po.BaseGoodsModels;
+import com.consum.model.po.S_dict_data;
import com.walker.jdbc.service.BaseServiceImpl;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.List;
@Service
public class SDictDataServiceImpl extends BaseServiceImpl {
+ /**
+ * @Description 鏍规嵁鎶ュ簾鍘熷洜code鏌ヨ鏁版嵁瀛楀吀
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/2
+ */
+ public List<S_dict_data> selectByScrappedCodeList(List<String> scrappedCodeList) {
+ if (CollectionUtils.isEmpty(scrappedCodeList)) {
+ log.error("鍙傛暟閿欒");
+ return null;
+ }
+ StringBuilder sql = new StringBuilder("SELECT * FROM s_dict_data WHERE 1 = 1 ");
+ HashMap<String, Object> paramts = new HashMap<>();
+
+ sql.append(" and dict_code in ( ");
+ for (int i = 0; i < scrappedCodeList.size(); i++) {
+ sql.append(scrappedCodeList.get(i));
+ if (i < scrappedCodeList.size() - 1) {
+ sql.append(",");
+ }
+ }
+ sql.append(" ) ");
+
+ return this.select(sql.toString(), paramts, new S_dict_data());
+ }
}
--
Gitblit v1.9.1