From b0841619e23dd01b8fba9561ad9036c7c3d6aa08 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 14 十一月 2023 14:05:20 +0800
Subject: [PATCH] 出库单管理
---
consum-base/src/main/java/com/consum/base/pojo/response/FormOutputGoodsVO.java | 30 +++
consum-base/src/main/java/com/consum/base/pojo/response/FormOutputVO.java | 72 +++++++
consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModel.java | 2
consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordServiceImpl.java | 12
consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java | 46 ++--
consum-base/src/main/java/com/consum/base/pojo/response/FormOutputTemplateInfoVO.java | 22 ++
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 111 +++++++---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 19 +
consum-base/src/main/java/com/consum/base/pojo/query/LWhFormOutputQry.java | 20 +-
consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java | 22 +-
consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput_mapper.java | 17 +
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 10
/dev/null | 146 --------------
consum-base/src/main/java/com/consum/base/pojo/query/TransferQry.java | 6
consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java | 1
consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQry.java | 6
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 17 -
consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput.java | 21 ++
consum-base/src/main/java/com/consum/base/pojo/response/LWhFormOutputExtendVO.java | 10
19 files changed, 317 insertions(+), 273 deletions(-)
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 4521463..5d0b7c4 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
@@ -2,25 +2,32 @@
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.core.utils.MapUtils;
import com.consum.base.pojo.LWhFormOutputExtend;
import com.consum.base.pojo.LWhFormOutputInsertParam;
-import com.consum.base.pojo.LWhFormOutputParam;
+import com.consum.base.pojo.query.LWhFormOutputQry;
+import com.consum.base.pojo.response.FormOutputGoodsVO;
+import com.consum.base.pojo.response.FormOutputTemplateInfoVO;
+import com.consum.base.pojo.response.FormOutputVO;
+import com.consum.base.pojo.response.GoodsModelVO;
+import com.consum.base.pojo.response.LWhFormOutputExtendVO;
import com.consum.base.service.LWhFormOutputServiceImpl;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;
-import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormOutput;
-import com.consum.model.po.LWhProcureModel;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import java.lang.reflect.Field;
-import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -51,7 +58,9 @@
* @Date 2023/10/27
*/
@ApiOperation(value = "鏂板鍑哄簱鍗�", notes = "鏂板鍑哄簱鍗�")
-// @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputInsertParam", paramType = "body")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputInsertParam", paramType = "body")
+ })
@PostMapping("/add")
public ResponseValue add() {
LWhFormOutputInsertParam param = CommonUtil.getObjFromReqBody(LWhFormOutputInsertParam.class);
@@ -73,63 +82,97 @@
@ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputParam", paramType = "query")
@GetMapping("/list")
public ResponseValue queryFormOutputList() {
- LWhFormOutputParam param = CommonUtil.getObjFromReq(LWhFormOutputParam.class);
+ LWhFormOutputQry param = CommonUtil.getObjFromReq(LWhFormOutputQry.class);
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- FinSysTenantUser sysInfo = getSysInfo();
-
- //鍙兘鏌ヨ鏈骇 鍙婁互涓嬫満鏋勭殑鍑哄簱鍗�
- //??????
GenericPager genericPager = lWhFormOutputService.queryFormOutputList(param);
- List<LWhFormOutput> datas = genericPager.getDatas();
- ArrayList<LWhFormOutputExtend> newDatas = new ArrayList<>();
- if (!CollectionUtils.isEmpty(datas)) {
- datas.forEach(item -> {
+ List<LWhFormOutput> data = genericPager.getDatas();
+
+ List<FormOutputVO> resultList = Lists.newArrayList();
+ if (!CollectionUtils.isEmpty(data)) {
+ data.forEach(item -> {
// 鏌ヨ鍨嬪彿鏁伴噺
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- lWhProcureModel.setBusinessType(3);
- lWhProcureModel.setBusinessId(item.getId());
- List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel);
- LWhFormOutputExtend formProcureExtend = new LWhFormOutputExtend();
- BeanUtils.copyProperties(item, formProcureExtend);
- formProcureExtend.setModels(models);
- newDatas.add(formProcureExtend);
+ FormOutputVO formOutputVO = new FormOutputVO();
+ BeanUtils.copyProperties(item, formOutputVO);
+
+ List<FormOutputTemplateInfoVO> procureTemplateInfoList = Lists.newArrayList();
+
+ // 鏌ヨ鍨嬪彿鏁伴噺
+ String sql = "SELECT bgt.id,bgm.GOODS_TEMPLATES_ID,GOODS_NAME,sum( counts ) count FROM "
+ + "l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON pm.BASE_GOODS_MODELS_ID = bgm.id "
+ + "LEFT JOIN base_goods_template bgt ON bgm.GOODS_TEMPLATES_ID = bgt.id "
+ + "WHERE pm.BUSINESS_ID =:id GROUP BY bgm.GOODS_TEMPLATES_ID";
+ Map<String, Object> paramMap = new HashMap<>();
+ paramMap.put("id", item.getId());
+ List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap);
+ for (Map<String, Object> map : procureModelList) {
+ FormOutputTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(MapUtils.toReplaceKeyLow(map), FormOutputTemplateInfoVO.class);
+ procureTemplateInfoList.add(procureTemplateInfoVO);
+ }
+ formOutputVO.setFormOutputTemplateInfoList(procureTemplateInfoList);
+
+ resultList.add(formOutputVO);
});
}
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
fieldDatas.setAccessible(true);
- fieldDatas.set(genericPager, newDatas);
+ fieldDatas.set(genericPager, resultList);
} catch (Exception e) {
e.printStackTrace();
}
-// genericPager.setDatas(newDatas);
return ResponseValue.success(genericPager);
}
/**
* 鏍规嵁id鏌ヨ璇︽儏
*/
+ @ApiOperation(value = "鏍规嵁id鏌ヨ璇︽儏", notes = "鏍规嵁id鏌ヨ璇︽儏")
+ @ApiImplicitParam(name = "id", value = "鍑哄簱鍗昳d", required = true, dataType = "Long", paramType = "query")
@GetMapping("/detail")
public ResponseValue getById(Long id) throws IllegalAccessException {
if (id == null) {
return ResponseValue.error("鍑哄簱鍗昳d涓虹┖");
}
LWhFormOutput lWhFormOutput = lWhFormOutputService.get(new LWhFormOutput(id));
+ LWhFormOutputExtendVO lWhFormOutputExtendVO = new LWhFormOutputExtendVO();
+
LWhFormOutputExtend formOutputExtend = new LWhFormOutputExtend();
BeanUtils.copyProperties(lWhFormOutput, formOutputExtend);
- // 鏌ヨ鍨嬪彿鏁伴噺
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- lWhProcureModel.setBusinessType(3);
- lWhProcureModel.setBusinessId(id);
- List<LWhProcureModel> models = lWhFormOutputService.select(lWhProcureModel);
- formOutputExtend.setModels(models);
+ BeanUtils.copyProperties(lWhFormOutput, lWhFormOutputExtendVO);
- return ResponseValue.success("鏌ヨ鎴愬姛!", formOutputExtend);
+ String sql = "SELECT bgt.id, CATEGORY_ID, CATEGORY_NAME, GOODS_NAME "
+ + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
+ + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID "
+ + "WHERE pm.BUSINESS_ID =:id GROUP BY bgt.id ";
+ Map<String, Object> paramMap = new HashMap<>();
+ paramMap.put("id", lWhFormOutputExtendVO.getId());
+ List<Map<String, Object>> procureModelList = lWhFormOutputService.select(sql, paramMap);
+ List<FormOutputGoodsVO> fromOutputGoods = Lists.newArrayList();
+ for (Map<String, Object> map : procureModelList) {
+ FormOutputGoodsVO procureTemplateInfoVO = MapUtils.convertMapToObj(MapUtils.toReplaceKeyLow(map), FormOutputGoodsVO.class);
+
+ // 鏌ヨ鍨嬪彿鏁伴噺
+ List<GoodsModelVO> goodsModelVOList = Lists.newArrayList();
+ String sql2 = "SELECT pm.id,pm.BASE_GOODS_MODELS_NAME,bgm.UNIT,COUNTS,total_amount "
+ + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
+ + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID "
+ + "WHERE pm.BUSINESS_ID =:id";
+ List<Map<String, Object>> modelList = lWhFormOutputService.select(sql2, paramMap);
+ modelList.forEach(item -> {
+ GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(MapUtils.toReplaceKeyLow(item), GoodsModelVO.class);
+ goodsModelVOList.add(goodsModelVO);
+ });
+ procureTemplateInfoVO.setModels(goodsModelVOList);
+ fromOutputGoods.add(procureTemplateInfoVO);
+ }
+ lWhFormOutputExtendVO.setFromOutputGoods(fromOutputGoods);
+
+ return ResponseValue.success("鏌ヨ鎴愬姛!", lWhFormOutputExtendVO);
}
/**
@@ -137,6 +180,11 @@
* @Author 鍗㈠簡闃�
* @Date 2023/11/2
*/
+ @ApiOperation(value = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨", notes = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "warehouseId", value = "浠撳簱id", required = true, dataType = "Long", paramType = "query"),
+ @ApiImplicitParam(name = "baseGoodsModelsId", value = "鍨嬪彿id", required = true, dataType = "Long", paramType = "query")
+ })
@GetMapping("/select/number")
public ResponseValue selectNumber(Long warehouseId, Long baseGoodsModelsId) {
if (warehouseId == null || baseGoodsModelsId == null) {
@@ -145,7 +193,6 @@
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/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index a3a2f81..0bef5bb 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -10,7 +10,7 @@
import com.consum.base.pojo.LWhFormProcureGoodsParams;
import com.consum.base.pojo.LWhFormProcureParam;
import com.consum.base.pojo.LWhProcureModelParams;
-import com.consum.base.pojo.query.FormProcureQryDto;
+import com.consum.base.pojo.query.FormProcureQry;
import com.consum.base.pojo.response.FormProcureVO;
import com.consum.base.pojo.response.FromProcureTemplateInfoVO;
import com.consum.base.pojo.response.GoodsModelVO;
@@ -103,11 +103,6 @@
FinSysTenantUser sysTenantUser = this.getSysInfo();
String tenantId = sysTenantUser.getTenantId();
String tenantName = sysTenantUser.getTenantName();
-// String tenantId = "100";
-// String tenantName = "娌冲崡鐪佸垎鍏徃";
- // 鍙兘娣诲姞鏈満鏋勪粨搴撶殑杩涜揣鍗�
- //??????
- //
List<LWhFormProcureGoodsParams> procureGoods = param.getProcureGoods();
if (CollectionUtils.isEmpty(procureGoods)) {
@@ -228,15 +223,11 @@
@ApiImplicitParam(name = "param", value = "閲囪喘鏌ヨ鏉′欢", required = true, dataType = "FormProcureQryDto", paramType = "query")
})
@GetMapping("/list")
- public ResponseValue queryFormProcureList(FormProcureQryDto param) {
+ public ResponseValue queryFormProcureList(FormProcureQry param) {
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- FinSysTenantUser sysInfo = getSysInfo();
-
- //鍙兘鏌ヨ鏈骇 鍙婁互涓嬫満鏋勭殑杩涜揣鍗�
- //??????
GenericPager genericPager = lWhFormProcureService.queryFormProcureList(param);
List<LWhFormProcure> data = genericPager.getDatas();
@@ -381,13 +372,13 @@
@ApiImplicitParams({@ApiImplicitParam(name = "param", value = "閲囪喘鍗曟槑缁嗘煡璇�", required = true, dataType = "FormProcureQryDto", paramType = "query")})
@GetMapping("detail/list")
public ResponseValue queryFormProcureDetailList() {
- FormProcureQryDto formProcureQryDto = CommonUtil.getObjFromReq(FormProcureQryDto.class);
+ FormProcureQry formProcureQry = CommonUtil.getObjFromReq(FormProcureQry.class);
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(formProcureQryDto);
+ GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(formProcureQry);
return ResponseValue.success(genericPager);
}
}
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 737e33f..cdb40c7 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
@@ -6,7 +6,7 @@
import com.consum.base.pojo.ProcureModelInfoDto;
import com.consum.base.pojo.UseRecordDto;
import com.consum.base.pojo.UseRecordSkuDto;
-import com.consum.base.pojo.query.TransferQryDto;
+import com.consum.base.pojo.query.TransferQry;
import com.consum.base.pojo.response.TransferInfoVO;
import com.consum.base.service.BaseGoodsModelsServiceImpl;
import com.consum.base.service.BaseWarehouseServiceImpl;
@@ -102,7 +102,7 @@
// 1.鏌ヨ璋冩嫧鍗�
// 2.鏌ヨ鐗╁搧鍨嬪彿
@GetMapping("/list")
- public ResponseValue queryFormTransferList(TransferQryDto param) {
+ public ResponseValue queryFormTransferList(TransferQry param) {
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -238,7 +238,7 @@
/**
* 閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏
*
- * @param transferQryDto
+ * @param transferQry
* @return
*/
@ApiOperation(value = "閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏", notes = "閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏")
@@ -246,13 +246,13 @@
@ApiImplicitParam(name = "transferQryDto", value = "璋冩嫧鍗曟煡璇㈡潯浠�", required = true)
})
@GetMapping("/department/list")
- public ResponseValue departmentTransferList(TransferQryDto transferQryDto) {
+ public ResponseValue departmentTransferList(TransferQry transferQry) {
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- GenericPager<Map<String, Object>> transferInfoDetailsVoGenericPager = this.lWhFormTransferService.queryTransferInfo(transferQryDto);
+ GenericPager<Map<String, Object>> transferInfoDetailsVoGenericPager = this.lWhFormTransferService.queryTransferInfo(transferQry);
return ResponseValue.success(transferInfoDetailsVoGenericPager);
}
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
deleted file mode 100644
index d39fffc..0000000
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputParam.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.consum.base.pojo;
-
-import com.walker.web.param.ParamRequest;
-
-import java.util.List;
-
-/**
- * @Description 鍑哄簱鍗曞弬鏁�
- * @Author 鍗㈠簡闃�
- * @Date 2023/10/27
- */
-public class LWhFormOutputParam extends ParamRequest {
- /**
- * 浠撳簱id
- */
- private Long warehouseId;
- /**
- * 鍑哄簱鏃堕棿
- */
- private Long dealTime;
- /**
- * 璁板綍鐗╁搧淇℃伅鍜岃鏍煎瀷鍙�
- */
- private List<LWhProcureModelParams> models;
- /**
- * 鐗╁搧id
- */
- private Long baseGoodsTemplateId;
- /**
- * 鐗╁搧妯＄増鍚嶇О
- */
- private String goodsTemplateName;
- /**
- * 鍑哄簱鍗曞彿
- */
- private String businessFormCode;
- /**
- * 鏈烘瀯
- */
- private Long agencyId;
- /**
- * 鍒涘缓浜�
- */
- private String operatorName;
- /**
- * 1=寰呭嚭搴擄紱2=宸插嚭搴�
- */
- private Short states;
-
- /**
- * 鍑哄簱鏃堕棿 寮�濮�
- */
- private Long outputTimeStart;
- /**
- * 鍑哄簱鏃堕棿 缁撴潫
- */
- private Long outputTimeEnd;
-
- 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<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;
- }
-
- public String getBusinessFormCode() {
- return businessFormCode;
- }
-
- public void setBusinessFormCode(String businessFormCode) {
- this.businessFormCode = businessFormCode;
- }
-
- public Long getAgencyId() {
- return agencyId;
- }
-
- public void setAgencyId(Long agencyId) {
- this.agencyId = agencyId;
- }
-
- public String getOperatorName() {
- return operatorName;
- }
-
- public void setOperatorName(String operatorName) {
- this.operatorName = operatorName;
- }
-
- public Short getStates() {
- return states;
- }
-
- public void setStates(Short states) {
- this.states = states;
- }
-
- public Long getOutputTimeStart() {
- return outputTimeStart;
- }
-
- public void setOutputTimeStart(Long outputTimeStart) {
- this.outputTimeStart = outputTimeStart;
- }
-
- public Long getOutputTimeEnd() {
- return outputTimeEnd;
- }
-
- public void setOutputTimeEnd(Long outputTimeEnd) {
- this.outputTimeEnd = outputTimeEnd;
- }
-}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQryDto.java b/consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQry.java
similarity index 94%
rename from consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQryDto.java
rename to consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQry.java
index 6044a9b..6bb7682 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQryDto.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQry.java
@@ -13,7 +13,7 @@
*/
@ApiModel(value = "閲囪喘鏌ヨ鏉′欢")
@Data
-public class FormProcureQryDto {
+public class FormProcureQry {
@ApiModelProperty(value = "涓婚敭")
private Long id;
@@ -53,13 +53,13 @@
*/
@ApiModelProperty(value = "鍏ュ簱鏃堕棿 寮�濮�")
@JsonFormat(pattern = "yyyyMMdd", timezone = "GMT+8")
- private Long incomeTimeStart;
+ private Long startTime;
/**
* 鍏ュ簱鏃堕棿 缁撴潫
*/
@ApiModelProperty(value = "鍏ュ簱鏃堕棿 缁撴潫")
@JsonFormat(pattern = "yyyyMMdd", timezone = "GMT+8")
- private Long incomeTimeEnd;
+ private Long endTime;
/**
* 瑙勬牸鍨嬪彿id
*/
diff --git a/consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQryDto.java b/consum-base/src/main/java/com/consum/base/pojo/query/LWhFormOutputQry.java
similarity index 81%
copy from consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQryDto.java
copy to consum-base/src/main/java/com/consum/base/pojo/query/LWhFormOutputQry.java
index 6044a9b..462c83e 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQryDto.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/query/LWhFormOutputQry.java
@@ -6,14 +6,13 @@
import lombok.Data;
/**
- * @author asus
- * @version 1.0
- * @description: 閲囪喘鏌ヨ鏉′欢
- * @date 2023/11/10 16:51
+ * @Description 鍑哄簱鍗曞弬鏁�
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/27
*/
-@ApiModel(value = "閲囪喘鏌ヨ鏉′欢")
@Data
-public class FormProcureQryDto {
+@ApiModel(value = "鍑哄簱鍗曞弬鏁�")
+public class LWhFormOutputQry {
@ApiModelProperty(value = "涓婚敭")
private Long id;
@@ -51,15 +50,15 @@
/**
* 鍏ュ簱鏃堕棿 寮�濮�
*/
- @ApiModelProperty(value = "鍏ュ簱鏃堕棿 寮�濮�")
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyyMMdd", timezone = "GMT+8")
- private Long incomeTimeStart;
+ private Long startTime;
/**
* 鍏ュ簱鏃堕棿 缁撴潫
*/
- @ApiModelProperty(value = "鍏ュ簱鏃堕棿 缁撴潫")
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
@JsonFormat(pattern = "yyyyMMdd", timezone = "GMT+8")
- private Long incomeTimeEnd;
+ private Long endTime;
/**
* 瑙勬牸鍨嬪彿id
*/
@@ -70,4 +69,5 @@
private Integer pageSize = 10;
@ApiModelProperty(value = "褰撳墠椤垫暟")
private Integer pageNum = 1;
+
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/query/TransferQryDto.java b/consum-base/src/main/java/com/consum/base/pojo/query/TransferQry.java
similarity index 96%
rename from consum-base/src/main/java/com/consum/base/pojo/query/TransferQryDto.java
rename to consum-base/src/main/java/com/consum/base/pojo/query/TransferQry.java
index f7fa1ad..dc008b1 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/query/TransferQryDto.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/query/TransferQry.java
@@ -12,7 +12,7 @@
*/
@ApiModel(value = "璋冩嫧鍗曟煡璇㈡潯浠�")
@Data
-public class TransferQryDto {
+public class TransferQry {
/**
@@ -59,12 +59,12 @@
* 鎺ユ敹鏃堕棿 寮�濮�
*/
@ApiModelProperty(value = "鎺ユ敹鏃堕棿 寮�濮�")
- private Long inTimeStart;
+ private Long startTime;
/**
* 鎺ユ敹鏃堕棿 缁撴潫
*/
@ApiModelProperty(value = "鎺ユ敹鏃堕棿 缁撴潫")
- private Long inTimeEnd;
+ private Long endTime;
/**
* 瑙勬牸鍨嬪彿id
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/FormOutputGoodsVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/FormOutputGoodsVO.java
new file mode 100644
index 0000000..8c0595e
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/FormOutputGoodsVO.java
@@ -0,0 +1,30 @@
+package com.consum.base.pojo.response;
+
+import io.swagger.annotations.ApiModel;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: TODO
+ * @date 2023/11/14 13:13
+ */
+@Data
+@ApiModel(description = "杈撳嚭鍟嗗搧琛�")
+public class FormOutputGoodsVO {
+
+ // 涓婚敭
+ private Long id;
+ //鍒嗙被缂栧彿
+ private Long categoryId;
+ //鍒嗙被鍚嶇О
+ private String categoryName;
+ //鐗╁搧妯＄増缂栧彿
+ private Long baseGoodsTemplateId;
+
+ private String goodsName;
+
+ private List<GoodsModelVO> models;
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/FormOutputTemplateInfoVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/FormOutputTemplateInfoVO.java
new file mode 100644
index 0000000..ea5dafe
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/FormOutputTemplateInfoVO.java
@@ -0,0 +1,22 @@
+package com.consum.base.pojo.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: TODO
+ * @date 2023/11/10 11:37
+ */
+@ApiModel
+@Data
+public class FormOutputTemplateInfoVO {
+
+ private Long id;
+ private Long goodsTemplatesId;
+ private String goodsName;
+ private Object count;
+
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/FormOutputVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/FormOutputVO.java
new file mode 100644
index 0000000..a8a7813
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/FormOutputVO.java
@@ -0,0 +1,72 @@
+package com.consum.base.pojo.response;
+
+import io.swagger.annotations.ApiModel;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: 鍑哄簱鍒楄〃淇℃伅
+ * @date 2023/11/10 11:37
+ */
+@ApiModel(value = "鍑哄簱鍒楄〃淇℃伅")
+@Data
+public class FormOutputVO {
+
+ // 涓婚敭
+ private Long id;
+
+
+ // 灞炴�у垪琛�
+ private String businessFormCode;
+
+
+ private Long warehouseId;
+
+
+ private String warehouseName;
+
+
+ private Long buyerId;
+
+
+ private String buyerName;
+
+
+ private Long procureTime;
+
+
+ private String procureDoc;
+
+
+ private Integer buyType;
+
+
+ private Integer states;
+
+
+ private Long agencyId;
+
+
+ private String agencyName;
+
+
+ private Long incomeId;
+
+
+ private String incomeName;
+
+
+ private Long incomeTime;
+
+
+ private String beiz;
+
+
+ private Long lWarehouseFlowId;
+
+ private List<FormOutputTemplateInfoVO> formOutputTemplateInfoList;
+
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java
index ec4c7e6..be3fb38 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java
@@ -18,6 +18,7 @@
private Integer counts;
private Integer worehouseCount;
private Long baseGoodsModelsId;
+ private Long totalAmount;
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/LWhFormOutputVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/LWhFormOutputExtendVO.java
similarity index 75%
rename from consum-base/src/main/java/com/consum/base/pojo/response/LWhFormOutputVO.java
rename to consum-base/src/main/java/com/consum/base/pojo/response/LWhFormOutputExtendVO.java
index 66ab9bc..5c03d48 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/response/LWhFormOutputVO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/LWhFormOutputExtendVO.java
@@ -1,6 +1,5 @@
package com.consum.base.pojo.response;
-import com.consum.model.po.LWhProcureModel;
import io.swagger.annotations.ApiModel;
import java.util.List;
import lombok.Data;
@@ -8,12 +7,12 @@
/**
* @author asus
* @version 1.0
- * @description: TODO
+ * @description: 鍑哄簱鍗曚俊鎭墿灞�
* @date 2023/11/13 16:45
*/
@Data
-@ApiModel
-public class LWhFormOutputVO {
+@ApiModel(value = "鍑哄簱鍗曚俊鎭墿灞�")
+public class LWhFormOutputExtendVO {
// 涓婚敭
@@ -47,6 +46,5 @@
// 鍑哄簱鎵嬬画
private Long doc;
- private List<FromProcureTemplateInfoVO> fromProcureTemplateInfoList;
- private List<LWhProcureModel> models;
+ private List<FormOutputGoodsVO> fromOutputGoods;
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordServiceImpl.java
index bfa9cca..5cd97eb 100644
--- a/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordServiceImpl.java
@@ -1,11 +1,11 @@
package com.consum.base.service;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* @ClassName LGoodsUserRecordServiceImpl
@@ -21,12 +21,10 @@
/**
* 璁剧疆涓洪潪鏈�鏂�
*/
- private static String updSetNotLast = "update L_GOODS_USER_RECORD set LAST_RECORD = 0 where WH_GOODS_ID in(?) and LAST_RECORD=1";
+ private static String updSetNotLast = "update L_GOODS_USER_RECORD set LAST_RECORD = 0 where LAST_RECORD=1 and WH_GOODS_ID in( ";
public int updSetNotLast(List<Long> outGoodsIds) {
- ArrayList<Object> params = new ArrayList<>();
- params.add(outGoodsIds);
- return this.update(updSetNotLast, params.toArray());
+ return this.update(updSetNotLast + StringUtils.join(outGoodsIds, ",") + ")", new String[]{});
}
/**
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 dd97fbc..038b6ec 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
@@ -7,7 +7,7 @@
import com.consum.base.pojo.LWFormsOutputGoodsModelParam;
import com.consum.base.pojo.LWFormsOutputGoodsParam;
import com.consum.base.pojo.LWhFormOutputInsertParam;
-import com.consum.base.pojo.LWhFormOutputParam;
+import com.consum.base.pojo.query.LWhFormOutputQry;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
@@ -174,6 +174,7 @@
lWhFormOutput.setOperatorName(sysInfo.getUserName());
lWhFormOutput.setDealTime(param.getDealTime());
lWhFormOutput.setStates(1);
+ lWhFormOutput.setOutputDoc(param.getProcureDoc());
int flag1 = this.insert(lWhFormOutput);
if (flag1 == 0) {
log.error("鏂板鍑哄簱鍗曡褰�");
@@ -225,12 +226,12 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
- public GenericPager queryFormOutputList(LWhFormOutputParam param) {
+ public GenericPager queryFormOutputList(LWhFormOutputQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(QUERY_FORM_OUTPUT_LIST);
//鍑哄簱鍗曞彿
if (!StringUtils.isEmpty(param.getBusinessFormCode())) {
- sql.append(" and BUSINESS_FORM_CODE like :businessFormCode ");
+ sql.append(" and BUSINESS_FORM_CODE = :businessFormCode ");
paramts.put("businessFormCode", StringUtils.CHAR_PERCENT + param.getBusinessFormCode() + StringUtils.CHAR_PERCENT);
}
//鐗╁搧鍚嶇О
@@ -245,9 +246,9 @@
paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
}
//鍒涘缓浜�
- if (!StringUtils.isEmpty(param.getOperatorName())) {
+ if (!StringUtils.isEmpty(param.getCreateName())) {
sql.append(" and operator_name =:operator_name ");
- paramts.put("operator_name", param.getOperatorName());
+ paramts.put("operator_name", param.getCreateName());
}
//鐘舵��
if (param.getStates() != null) {
@@ -255,13 +256,13 @@
paramts.put("states", param.getStates());
}
//鍑哄簱鏃堕棿
- if (param.getOutputTimeStart() != null) {
+ if (param.getStartTime() != null) {
sql.append(" and DEAL_TIME >=:outputTimeStart ");
- paramts.put("outputTimeStart", param.getOutputTimeStart() * 1000000);
+ paramts.put("outputTimeStart", param.getStartTime() * 1000000);
}
- if (param.getOutputTimeEnd() != null) {
+ if (param.getEndTime() != null) {
sql.append(" and DEAL_TIME <:outputTimeEnd ");
- paramts.put("outputTimeEnd", param.getOutputTimeEnd() * 1000000 + 240000);
+ paramts.put("outputTimeEnd", param.getEndTime() * 1000000 + 240000);
}
sql.append(" ORDER BY DEAL_TIME DESC");
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
index 0b7c3dd..a5cc5ab 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
@@ -1,7 +1,7 @@
package com.consum.base.service;
import com.consum.base.core.utils.MapperUtil;
-import com.consum.base.pojo.query.FormProcureQryDto;
+import com.consum.base.pojo.query.FormProcureQry;
import com.consum.model.po.LWhFormProcure;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
@@ -21,7 +21,7 @@
private static String QUERY_FORM_PROCURE_LIST = "SELECT * FROM L_WH_FORM_PROCURE WHERE 1 = 1";
- public GenericPager<LWhFormProcure> queryFormProcureList(FormProcureQryDto param) {
+ public GenericPager<LWhFormProcure> queryFormProcureList(FormProcureQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(QUERY_FORM_PROCURE_LIST);
//鍏ュ簱鍗曞彿
@@ -44,13 +44,13 @@
paramts.put("states", param.getStates());
}
//鍏ュ簱鏃堕棿
- if (param.getIncomeTimeStart() != null) {
+ if (param.getStartTime() != null) {
sql.append(" and INCOME_TIME >=:incomeTimeStart ");
- paramts.put("incomeTimeStart", param.getIncomeTimeStart() * 1000000);
+ paramts.put("incomeTimeStart", param.getStartTime() * 1000000);
}
- if (param.getIncomeTimeEnd() != null) {
+ if (param.getEndTime() != null) {
sql.append(" and INCOME_TIME <:incomeTimeEnd ");
- paramts.put("incomeTimeEnd", param.getIncomeTimeEnd() * 1000000 + 240000);
+ paramts.put("incomeTimeEnd", param.getEndTime() * 1000000 + 240000);
}
//鐗╁搧鍚嶇О
if (!StringUtils.isEmpty(param.getGoodsTemplateName())) {
@@ -64,7 +64,7 @@
}
- public GenericPager<Map<String, Object>> queryFormProcureDetailList(FormProcureQryDto param) {
+ public GenericPager<Map<String, Object>> queryFormProcureDetailList(FormProcureQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder("SELECT pm.id,fp.BUSINESS_FORM_CODE,fpg.GOODS_TEMPLATE_NAME,pm.PRICE,pm.COUNTS, "
+ "( pm.PRICE * pm.COUNTS ) amount,fp.AGENCY_NAME,fp.BUYER_NAME,fp.PROCURE_TIME,pm.BUSINESS_ID,pm.BASE_GOODS_MODELS_NAME FROM l_wh_procure_model pm "
@@ -90,14 +90,14 @@
paramts.put("buyerName", param.getCreateName());
}
//鍏ュ簱寮�濮嬫椂闂�
- if (param.getIncomeTimeStart() != null) {
+ if (param.getStartTime() != null) {
sql.append("and INCOME_TIME >=:incomeTimeStart ");
- paramts.put("incomeTimeStart", param.getIncomeTimeStart() * 1000000);
+ paramts.put("incomeTimeStart", param.getStartTime() * 1000000);
}
//鍏ュ簱缁撴潫鏃堕棿
- if (param.getIncomeTimeEnd() != null) {
+ if (param.getEndTime() != null) {
sql.append("and INCOME_TIME <:incomeTimeEnd ");
- paramts.put("incomeTimeEnd", param.getIncomeTimeEnd() * 1000000 + 240000);
+ paramts.put("incomeTimeEnd", param.getEndTime() * 1000000 + 240000);
}
//瑙勬牸鍨嬪彿
if (param.getBaseGoodsModelsId() != null) {
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
index c13593f..6cda935 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
@@ -2,12 +2,12 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
+import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapRowMapper;
import com.consum.base.pojo.LWhFormTransferParam;
import com.consum.base.pojo.LWhProcureModelParams;
import com.consum.base.pojo.LWhProcureModelUserDTO;
-import com.consum.base.pojo.query.TransferQryDto;
-import com.consum.base.core.utils.IdUtil;
+import com.consum.base.pojo.query.TransferQry;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenant;
@@ -182,7 +182,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
- public GenericPager<LWhFormTransfer> queryFormTransferList(TransferQryDto param) {
+ public GenericPager<LWhFormTransfer> queryFormTransferList(TransferQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(QUERY_FORM_TRANSFER_LIST);
//璋冩嫧鍗曞彿
@@ -226,13 +226,13 @@
paramts.put("createTimeEnd", param.getCreateTimeEnd() * 1000000 + 240000);
}
//鎺ユ敹鏃堕棿
- if (param.getInTimeStart() != null) {
+ if (param.getStartTime() != null) {
sql.append(" and IN_TIME >=:inTimeStart ");
- paramts.put("inTimeStart", param.getInTimeStart() * 1000000);
+ paramts.put("inTimeStart", param.getStartTime() * 1000000);
}
- if (param.getInTimeEnd() != null) {
+ if (param.getEndTime() != null) {
sql.append(" and IN_TIME <:inTimeEnd ");
- paramts.put("inTimeEnd", param.getInTimeEnd() * 1000000 + 240000);
+ paramts.put("inTimeEnd", param.getEndTime() * 1000000 + 240000);
}
sql.append(" ORDER BY CREATE_TIME DESC");
@@ -324,7 +324,7 @@
return this.update(lWhFormTransfer);
}
- public GenericPager<Map<String, Object>> queryTransferInfo(TransferQryDto transferQryDto) {
+ public GenericPager<Map<String, Object>> queryTransferInfo(TransferQry transferQry) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder("SELECT\n"
@@ -348,43 +348,43 @@
+ "\tLEFT JOIN fin_sys_tenant_department fstd ON fstu.SYS_DEPT_ID = fstd.ID \n"
+ "\tLEFT JOIN fin_sys_tenant fst ON fst.id = fstd.TENANT_ID where 1=1 ");
//鍗曞彿
- if (StringUtils.isNotEmpty(transferQryDto.getBusinessFormCode())) {
+ if (StringUtils.isNotEmpty(transferQry.getBusinessFormCode())) {
sql.append("AND BUSINESS_FORM_CODE like :businessFormCode ");
- paramts.put("businessFormCode", StringUtils.CHAR_PERCENT + transferQryDto.getBusinessFormCode() + StringUtils.CHAR_PERCENT);
+ paramts.put("businessFormCode", StringUtils.CHAR_PERCENT + transferQry.getBusinessFormCode() + StringUtils.CHAR_PERCENT);
}
//鐗╁搧鍚嶇О
- if (StringUtils.isNotEmpty(transferQryDto.getGoodsTemplateName())) {
+ if (StringUtils.isNotEmpty(transferQry.getGoodsTemplateName())) {
sql.append("AND bgt.GOODS_NAME like:goodsName ");
- paramts.put("goodsName", StringUtils.CHAR_PERCENT + transferQryDto.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ paramts.put("goodsName", StringUtils.CHAR_PERCENT + transferQry.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
// 瑙勬牸鍨嬪彿
- if (transferQryDto.getBaseGoodsTemplateId() != null) {
+ if (transferQry.getBaseGoodsTemplateId() != null) {
sql.append("AND bgm.id =:goodsModelId ");
- paramts.put("goodsModelId", transferQryDto.getBaseGoodsTemplateId());
+ paramts.put("goodsModelId", transferQry.getBaseGoodsTemplateId());
}
//璋冩嫧鏈烘瀯
- if (transferQryDto.getOutAgencyId() != null) {
+ if (transferQry.getOutAgencyId() != null) {
sql.append("AND OUT_AGENCY_ID = :OUT_AGENCY_ID ");
- paramts.put("OUT_AGENCY_ID", transferQryDto.getOutAgencyId());
+ paramts.put("OUT_AGENCY_ID", transferQry.getOutAgencyId());
}
//鍒涘缓浜�
- if (StringUtils.isNotEmpty(transferQryDto.getOperatorName())) {
+ if (StringUtils.isNotEmpty(transferQry.getOperatorName())) {
sql.append("AND ft.OPERATOR_NAME =:OPERATOR_NAME ");
- paramts.put("OPERATOR_NAME", transferQryDto.getOperatorName());
+ paramts.put("OPERATOR_NAME", transferQry.getOperatorName());
}
//鐢宠鏃堕棿
- if (transferQryDto.getCreateTimeStart() != null) {
+ if (transferQry.getCreateTimeStart() != null) {
sql.append("AND ft.CREATE_TIME >=:createTimeStart ");
- paramts.put("createTimeStart", transferQryDto.getCreateTimeStart() * 1000000);
+ paramts.put("createTimeStart", transferQry.getCreateTimeStart() * 1000000);
}
- if (transferQryDto.getCreateTimeEnd() != null) {
+ if (transferQry.getCreateTimeEnd() != null) {
sql.append("AND ft.CREATE_TIME <:createTimeEnd ");
- paramts.put("createTimeEnd", transferQryDto.getCreateTimeEnd() * 1000000 + 240000);
+ paramts.put("createTimeEnd", transferQry.getCreateTimeEnd() * 1000000 + 240000);
}
sql.append("ORDER BY ft.CREATE_TIME DESC");
- GenericPager<Map<String, Object>> mapGenericPager = this.selectSplit(sql.toString(), paramts, transferQryDto.getPageNum(), transferQryDto.getPageSize(),
+ GenericPager<Map<String, Object>> mapGenericPager = this.selectSplit(sql.toString(), paramts, transferQry.getPageNum(), transferQry.getPageSize(),
new MapRowMapper());
return mapGenericPager;
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput.java
index 3874dec..8d8cd19 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput.java
@@ -96,6 +96,10 @@
@JsonIgnore
protected boolean isset_beiz = false;
+ private String outputDoc;
+ @JsonIgnore
+ protected boolean isset_outputDoc = false;
+
/**
* 榛樿鏋勯�犲嚱鏁�
*/
@@ -397,6 +401,20 @@
return this.beiz == null || this.beiz.length() == 0;
}
+ public String getOutputDoc() {
+ return this.outputDoc;
+ }
+
+ public void setOutputDoc(String outputDoc) {
+ this.outputDoc = outputDoc;
+ this.isset_outputDoc = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOutputDoc() {
+ return this.outputDoc == null || this.outputDoc.length() == 0;
+ }
+
/**
* 閲嶅啓 toString() 鏂规硶
*/
@@ -497,6 +515,9 @@
if (this.isset_beiz) {
l_wh_form_output.setBeiz(this.getBeiz());
}
+ if (this.isset_outputDoc) {
+ l_wh_form_output.setOutputDoc(this.getOutputDoc());
+ }
return l_wh_form_output;
}
}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput_mapper.java
index 8c24516..086aa54 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput_mapper.java
@@ -7,13 +7,10 @@
import com.walker.jdbc.sqlgen.InsertBuilder;
import com.walker.jdbc.sqlgen.SelectBuilder;
import com.walker.jdbc.sqlgen.UpdateBuilder;
-import com.walker.jdbc.util.StringUtils;
-
-import org.springframework.jdbc.core.RowMapper;
-
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Map;
+import org.springframework.jdbc.core.RowMapper;
/**
* 琛ㄥ悕:L_WH_FORM_OUTPUT *
@@ -47,6 +44,7 @@
public static final String DealTime = "deal_time";
public static final String States = "states";
public static final String Beiz = "beiz";
+ public static final String OutputDoc = "output_doc";
/**
* 榛樿鏋勯�犲嚱鏁�
@@ -117,6 +115,9 @@
if (lWhFormOutput.isset_beiz) {
this.setBeiz(lWhFormOutput.getBeiz());
}
+ if (lWhFormOutput.isset_outputDoc) {
+ this.setOutputDoc(lWhFormOutput.getOutputDoc());
+ }
// 鍘绘帀锛�2022-09-07
// this.setDatabaseName_(l_wh_form_output.getDatabaseName_());
}
@@ -179,6 +180,7 @@
ib.set(DealTime, this.getDealTime(), this.isset_dealTime);
ib.set(States, this.getStates(), this.isset_states);
ib.set(Beiz, this.getBeiz(), this.isset_beiz);
+ ib.set(OutputDoc, this.getOutputDoc(), this.isset_outputDoc);
return ib.genMapSql();
}
@@ -207,6 +209,7 @@
ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
ub.set(States, this.getStates(), this.isset_states);
ub.set(Beiz, this.getBeiz(), this.isset_beiz);
+ ub.set(OutputDoc, this.getOutputDoc(), this.isset_outputDoc);
ub.where(this.getPkName_(), this.getPkValue_());
return ub.genMapSql();
}
@@ -236,6 +239,7 @@
ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
ub.set(States, this.getStates(), this.isset_states);
ub.set(Beiz, this.getBeiz(), this.isset_beiz);
+ ub.set(OutputDoc, this.getOutputDoc(), this.isset_outputDoc);
return ub.genMapSql(where, parameters);
}
@@ -264,6 +268,7 @@
ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
ub.set(States, this.getStates(), this.isset_states);
ub.set(Beiz, this.getBeiz(), this.isset_beiz);
+ ub.set(OutputDoc, this.getOutputDoc(), this.isset_outputDoc);
return ub.genArraySql(where, parameters);
}
@@ -476,6 +481,10 @@
if (columnIndex > 0) {
l_wh_form_output.setBeiz(rs.getString(columnIndex));
}
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.OutputDoc);
+ if (columnIndex > 0) {
+ l_wh_form_output.setOutputDoc(rs.getString(columnIndex));
+ }
return l_wh_form_output;
}
}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModel.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModel.java
index fc11a49..cb04dac 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModel.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModel.java
@@ -224,7 +224,7 @@
}
public Long getTotalAmount() {
- return totalAmount;
+ return this.totalAmount;
}
public void setTotalAmount(Long totalAmount) {
--
Gitblit v1.9.1