From 53813b862f027c97c967415bb7773ffbf6b6ea3d Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 01 十二月 2023 14:51:49 +0800
Subject: [PATCH] feat: 部门报废
---
consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedModel.java | 44 +-
consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedModel_mapper.java | 70 ++--
consum-base/src/main/java/com/consum/base/pojo/DepFormScrappedGoodsParam.java | 35 ++
consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrapped.java | 60 ++++
consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java | 6
consum-base/src/main/java/com/consum/base/service/SDictDataServiceImpl.java | 23 +
consum-base/src/main/java/com/consum/base/pojo/DepFormScrappedModelParam.java | 51 +++
admin-web/src/api/stock/deptScrap.js | 11
consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java | 228 +++++++++++++++++
admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue | 8
consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java | 70 +++++
consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java | 2
consum-base/src/main/java/com/consum/base/pojo/query/LDeptFormScrappedQry.java | 43 +++
consum-base/src/main/java/com/consum/base/pojo/LDeptFormScrappedParam.java | 24 -
consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrapped_mapper.java | 46 ++
15 files changed, 612 insertions(+), 109 deletions(-)
diff --git a/admin-web/src/api/stock/deptScrap.js b/admin-web/src/api/stock/deptScrap.js
new file mode 100644
index 0000000..39ed3ec
--- /dev/null
+++ b/admin-web/src/api/stock/deptScrap.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request';
+
+// 鐗╁搧鎶ュ簾
+// 鏂板
+export function scrappedAdd(data) {
+ return request({
+ url: '/pc/l/wh/form/scrapped/deptAdd',
+ method: 'post',
+ data,
+ });
+}
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
index a9e5711..969e3f5 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
@@ -229,7 +229,7 @@
<script>
import {departmentListAll} from '@/api/system/deptment';
import {goodsTemplate} from '@/api/baseSetting/finsystenant';
-import {outputAdd} from '@/api/stock/accessStock';
+import {scrappedAdd} from '@/api/stock/deptScrap';
import {getTree} from '@/api/foudation/classification';
import MyButton from '@/components/myButton/myButton';
import winMd from '@/components/win/win-md';
@@ -521,9 +521,9 @@
})
g.models = arr
})
- console.log('params', params);
- return
- outputAdd(this.formData)
+ // console.log('params', params);
+ // return
+ scrappedAdd(params)
.then((res) => {
this.$message.success('淇濆瓨鎴愬姛锛�');
this.close();
diff --git a/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
new file mode 100644
index 0000000..7d75df1
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
@@ -0,0 +1,70 @@
+package com.consum.base.controller;
+
+import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.pojo.LDeptFormScrappedParam;
+import com.consum.base.pojo.query.LDeptFormScrappedQry;
+import com.consum.base.service.DepFormScrappedServiceImpl;
+import com.consum.model.po.FinSysTenantUser;
+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 org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @ClassName DepFormScrappedController
+ * @Author cy
+ * @Date 2023/11/30
+ * @Description
+ * @Version 1.0
+ **/
+@Api(value = "搴撶鍛�", tags = "搴撶鍛�")
+@RestController
+@RequestMapping("/pc/l/wh/form/scrapped")
+public class DepFormScrappedController extends BaseController {
+ @Resource
+ private DepFormScrappedServiceImpl depFormScrappedService;
+
+ @ApiOperation(value = "鏂板鎶ュ簾鍗�", notes = "鏂板鎶ュ簾鍗�")
+ @PostMapping("/deptAdd")
+ public ResponseValue deptAdd() {
+ LDeptFormScrappedParam param = CommonUtil.getObjFromReqBody(LDeptFormScrappedParam.class);
+ LDeptFormScrappedParam query = new LDeptFormScrappedParam();
+ CommonUtil.copyProperties(param, query);
+ param = query;
+
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ return depFormScrappedService.add(param, this.getCurrentUser(), sysInfo);
+ }
+
+ /**
+ * @Description 鍒楄〃鏌ヨ
+ * 1.鏌ヨ鎶ュ簾鍗� 2.鏌ヨ鎶ュ簾鍗曠墿鍝�
+ * @Date
+ */
+ @ApiOperation(value = "鍒楄〃鏌ヨ", notes = "鍒楄〃鏌ヨ")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "param", value = "鏌ヨ鏉′欢", dataType = "LWhFormScrappedQry", paramType = "query")
+ })
+ @GetMapping("/deptList")
+ public ResponseValue queryList() {
+ LDeptFormScrappedQry param = CommonUtil.getObjFromReq(LDeptFormScrappedQry.class);
+ LDeptFormScrappedQry query = new LDeptFormScrappedQry();
+ CommonUtil.copyProperties(param, query);
+ param = query;
+
+ FinSysTenantUser sysInfo = getSysInfo();
+ if (sysInfo == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ param.setAgencyId(sysInfo.getTenantId());
+ return ResponseValue.success(depFormScrappedService.queryList(param));
+ }
+}
diff --git a/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java b/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java
index 3d2b8f5..142719f 100644
--- a/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java
+++ b/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java
@@ -794,15 +794,15 @@
his.setEndCount(result.getEnd_count());
his.setWarehouseId(scrapped.getOutWarehouseId());
his.setWarehouseName(scrapped.getOutWarehouseName());
- his.setDepartmentId(scrapped.getDepartmentId());
- his.setDepartmentName(scrapped.getDepartmentName());
+// his.setDepartmentId(scrapped.getDepartmentId());
+// his.setDepartmentName(scrapped.getDepartmentName());
insert(his);
DepFormScrappedModel model = new DepFormScrappedModel();
model.setId(NumberGenerator.getLongSequenceNumber());
model.setDepFormScrappedGoodsId(map.getLong("DEP_FORM_SCRAPPED_GOODS_ID"));
- model.setScrappedCode(map.getString("SCRAPPED_CODE"));
+ model.setScrappedCode(map.getLong("SCRAPPED_CODE"));
model.setScrappedName(map.getString("SCRAPPED_NAME"));
// model.setUsingGoodsHisId(his.getId());
// model.setDepFormScrappedId(scrapped.getId());
diff --git a/consum-base/src/main/java/com/consum/base/pojo/DepFormScrappedGoodsParam.java b/consum-base/src/main/java/com/consum/base/pojo/DepFormScrappedGoodsParam.java
new file mode 100644
index 0000000..cea29f7
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/DepFormScrappedGoodsParam.java
@@ -0,0 +1,35 @@
+package com.consum.base.pojo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName DepFormScrappedGoodsParam
+ * @Author cy
+ * @Date 2023/12/1
+ * @Description
+ * @Version 1.0
+ **/
+@Data
+public class DepFormScrappedGoodsParam {
+
+ @ApiModelProperty("鍒嗙被id")
+ private Long baseCategoryId;
+
+ @ApiModelProperty("鐗╁搧妯＄増缂栧彿")
+ private Long baseGoodsTemplateId;
+ private String goodsTemplateName;
+
+// @ApiModelProperty("璋冩嫧鍗曠紪鐮�")
+// private String businessFormCode;
+
+ @ApiModelProperty("璋冩嫧鍗旾d")
+ private Long transBusinessId;
+
+ /**
+ * 鍨嬪彿
+ */
+ private List<DepFormScrappedModelParam> models;
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/DepFormScrappedModelParam.java b/consum-base/src/main/java/com/consum/base/pojo/DepFormScrappedModelParam.java
new file mode 100644
index 0000000..a793830
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/DepFormScrappedModelParam.java
@@ -0,0 +1,51 @@
+package com.consum.base.pojo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName DepFormScrappedModelParam
+ * @Author cy
+ * @Date 2023/12/1
+ * @Description
+ * @Version 1.0
+ **/
+@Data
+public class DepFormScrappedModelParam {
+ @ApiModelProperty("鐗╁搧鍨嬪彿id")
+ private Long baseGoodsModelsId;
+
+ @ApiModelProperty("浠峰�肩被鍨�")
+ private String classification;//"B绫�"
+
+ @ApiModelProperty("鎶ュ簾鏁伴噺")
+ private Integer counts;
+
+ @ApiModelProperty("鍒嗗彂鏁伴噺")
+ private Integer goodsNum;
+
+ @ApiModelProperty("鍦ㄧ敤鏁伴噺")
+ private Integer userUseCount;
+
+ @ApiModelProperty("鐗╁搧id")
+ private Long goodsTemplatesId;
+
+ @ApiModelProperty("鐗╁搧鍨嬪彿")
+ private String modelName;
+
+ @ApiModelProperty("璋冩嫧浣跨敤浜鸿〃涓璉D(A绫荤墿鍝佸～)")
+ private Long modelUserId;
+
+ @ApiModelProperty("浣跨敤浜哄憳鍚嶇О(鍙笉濉�)")
+ private String nowUserName;
+
+// @ApiModelProperty("浣跨敤浜哄憳鍚嶇О(鍙笉濉�)")
+// private String nowUserPhone;
+
+ @ApiModelProperty("鎶ュ簾鍘熷洜CODE")
+ private Long scrappedCode;
+
+ @ApiModelProperty("璁￠噺鍗曚綅")
+ private String unit;
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LDeptFormScrappedParam.java b/consum-base/src/main/java/com/consum/base/pojo/LDeptFormScrappedParam.java
index 9dc76c5..6532580 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LDeptFormScrappedParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LDeptFormScrappedParam.java
@@ -13,9 +13,6 @@
@ApiModelProperty(value = "閮ㄩ棬id")
private Long departmentId;
- @ApiModelProperty(value = "閮ㄩ棬ID")
- private Long outWarehouseId;
-
/**
* 鎶ュ簾鏃堕棿
*/
@@ -27,29 +24,14 @@
@ApiModelProperty(value = "鎵嬬画")
private String procureDoc;
-
-
- /**
- * 鏈烘瀯id
- */
- @ApiModelProperty(value = "鏈烘瀯id")
- private Long agencyId;
-
- /**
- * 浠撳簱缂栧彿
- */
- @ApiModelProperty(value = "浠撳簱缂栧彿")
- private Long warehouseId;
/**
* 鎿嶄綔浜�
*/
- @ApiModelProperty(value = "鎿嶄綔浜�")
- private Long operatorId;
-
-
+// @ApiModelProperty(value = "鎿嶄綔浜�")
+// private String operatorName;
@ApiModelProperty(value = "鎶ュ簾鍟嗗搧淇℃伅")
- private List<LWhFormScrappedGoodsInfoParam> scrappedGoodsInfo;
+ private List<DepFormScrappedGoodsParam> goods;
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/query/LDeptFormScrappedQry.java b/consum-base/src/main/java/com/consum/base/pojo/query/LDeptFormScrappedQry.java
new file mode 100644
index 0000000..9e5fcdb
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/query/LDeptFormScrappedQry.java
@@ -0,0 +1,43 @@
+package com.consum.base.pojo.query;
+
+import lombok.Data;
+
+/**
+ * @ClassName LDeptFormScrappedQry
+ * @Author cy
+ * @Date 2023/12/1
+ * @Description
+ * @Version 1.0
+ **/
+@Data
+public class LDeptFormScrappedQry {
+ /**
+ * 鎶ュ簾鍗曞彿
+ */
+ private String businessFormCode;
+ /**
+ * 鐗╁搧妯＄増鍚嶇О
+ */
+ private String goodsTemplateName;
+ /**
+ * 鎶ュ簾鏃堕棿 寮�濮�
+ */
+ private Long startTime;
+ /**
+ * 鎶ュ簾鏃堕棿 缁撴潫
+ */
+ private Long endTime;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ private String operatorName;
+ /**
+ * 鏈烘瀯
+ */
+ private String agencyId;
+
+ private Integer pageSize = 10;
+ private Integer pageNum = 1;
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
new file mode 100644
index 0000000..62021c8
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
@@ -0,0 +1,228 @@
+package com.consum.base.service;
+
+import cn.hutool.core.convert.Convert;
+import com.consum.base.core.CodeGeneratorEnum;
+import com.consum.base.core.CodeGeneratorService;
+import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.pojo.DepFormScrappedGoodsParam;
+import com.consum.base.pojo.DepFormScrappedModelParam;
+import com.consum.base.pojo.LDeptFormScrappedParam;
+import com.consum.base.pojo.query.LDeptFormScrappedQry;
+import com.consum.model.po.*;
+import com.iplatform.model.po.S_user_core;
+import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.CollectionUtils;
+import com.walker.infrastructure.utils.DateUtils;
+import com.walker.infrastructure.utils.NumberGenerator;
+import com.walker.infrastructure.utils.StringUtils;
+import com.walker.jdbc.service.BaseServiceImpl;
+import com.walker.web.ResponseValue;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @ClassName DepFormScrappedServiceImpl
+ * @Author cy
+ * @Date 2023/11/30
+ * @Description
+ * @Version 1.0
+ **/
+@Service
+public class DepFormScrappedServiceImpl extends BaseServiceImpl {
+
+ @Resource
+ private CodeGeneratorService codeGeneratorService;
+ @Resource
+ private FinSysTenantDepartmentServiceImpl departmentService;
+ @Resource
+ private LWhFormTransferServiceImpl lWhFormTransferService;
+ @Resource
+ private BaseCategoryServiceImpl baseCategoryService;
+ @Resource
+ private SDictDataServiceImpl sDictDataService;
+ @Resource
+ private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+
+ @Transactional
+ public ResponseValue add(LDeptFormScrappedParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
+ long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
+
+ //1.鏂板鎶ュ簾鍗曡褰�
+ DepFormScrapped lDeptFormScrapped = new DepFormScrapped();
+ //鎶ュ簾鍗昳d
+ long lWhFormScrappedId = NumberGenerator.getLongSequenceNumber();
+ lDeptFormScrapped.setId(lWhFormScrappedId);
+ lDeptFormScrapped.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Scrapped));
+ lDeptFormScrapped.setProcureDoc(param.getProcureDoc());
+ lDeptFormScrapped.setOutWarehouseType(1);
+ lDeptFormScrapped.setOutWarehouseId(param.getDepartmentId());
+ // 鏌ヨ閮ㄩ棬鍚嶇О
+ FinSysTenantDepartment sysTenantDepartment = departmentService.getById(param.getDepartmentId());
+ if (sysTenantDepartment == null) {
+ log.error("閮ㄩ棬涓嶅瓨鍦�");
+ return ResponseValue.error("閮ㄩ棬涓嶅瓨鍦�");
+ }
+ lDeptFormScrapped.setOutWarehouseName(sysTenantDepartment.getName());
+
+ lDeptFormScrapped.setOperatorId(sysInfo.getSysUserId());
+ lDeptFormScrapped.setOperatorName(sysInfo.getUserName());
+ lDeptFormScrapped.setDealTime(param.getDealTime());
+ lDeptFormScrapped.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
+ lDeptFormScrapped.setAgencyName(sysInfo.getTenantName());
+ //鏍规嵁閮ㄩ棬id鏌ヨ閮ㄩ棬
+ FinSysTenantDepartment department = this.departmentService.getById(sysInfo.getSysDeptId());
+ if (department != null) {
+ lDeptFormScrapped.setDepartmentId(sysInfo.getSysDeptId());
+ lDeptFormScrapped.setDepartmentName(department.getName());
+ }
+
+
+ lDeptFormScrapped.setCreateTime(dealTime);
+ lDeptFormScrapped.setStates(1);
+
+ //2.鎶ュ簾鍗曠墿鍝併�怐EP_FORM_SCRAPPED_GOODS銆�
+ List<DepFormScrappedGoodsParam> scrappedGoodsInfo = param.getGoods();
+ if (CollectionUtils.isEmpty(scrappedGoodsInfo)) {
+ return ResponseValue.error("鎶ュ簾鍗曠墿鍝佷笉鑳戒负绌�");
+ }
+ ArrayList<DepFormScrappedGoods> scrappedGoodsArrayList = new ArrayList<>();
+ ArrayList<DepFormScrappedModel> modelArrayList = new ArrayList<>();
+
+ for (DepFormScrappedGoodsParam depFormScrappedGoodsParam : scrappedGoodsInfo) {
+ DepFormScrappedGoods depFormScrappedGoods = new DepFormScrappedGoods();
+ depFormScrappedGoods.setId(NumberGenerator.getLongSequenceNumber());
+ depFormScrappedGoods.setDepFormScrappedId(lWhFormScrappedId);
+ depFormScrappedGoods.setBaseGoodsTemplateId(depFormScrappedGoodsParam.getBaseGoodsTemplateId());
+ depFormScrappedGoods.setBaseGoodsTemplateName(depFormScrappedGoodsParam.getGoodsTemplateName());
+
+ // 鍒嗙被淇℃伅
+ Long baseCategoryId = depFormScrappedGoodsParam.getBaseCategoryId();
+ BaseCategory baseCategory = baseCategoryService.get(new BaseCategory(baseCategoryId));
+ if (baseCategory != null) {
+ depFormScrappedGoods.setCategoryName(baseCategory.getCategoryName());
+ depFormScrappedGoods.setClassification(baseCategory.getClassification());
+ }
+ // 鏌ヨ鍒嗗彂鍗曚俊鎭�
+ Long transBusinessId = depFormScrappedGoodsParam.getTransBusinessId();
+ LWhFormTransfer lWhFormTransfer = lWhFormTransferService.get(new LWhFormTransfer(transBusinessId));
+ if (lWhFormTransfer == null) {
+ return ResponseValue.error("鎶ュ簾鍗曠墿鍝佷笉鑳戒负绌�");
+
+ }
+ depFormScrappedGoods.setTransBusinessId(transBusinessId);
+ depFormScrappedGoods.setBusinessFormCode(lWhFormTransfer.getBusinessFormCode());
+ depFormScrappedGoods.setTransOutWarehouseId(lWhFormTransfer.getOutWarehouseId());
+ depFormScrappedGoods.setTransOutWarehouseType(lWhFormTransfer.getOutWarehouseType());
+
+ // 鍨嬪彿淇℃伅
+ List<DepFormScrappedModelParam> modelList = depFormScrappedGoodsParam.getModels();
+ if (CollectionUtils.isEmpty(modelList)) {
+ return ResponseValue.error("鎶ュ簾鍗曠墿鍝佸瀷鍙蜂笉鑳戒负绌�");
+
+ }
+ //鑾峰彇鎶ュ簾鍘熷洜code
+ List<Long> scrappedCodeList = modelList.stream().map(params -> params.getScrappedCode()).collect(Collectors.toList());
+ //鏍规嵁鎶ュ簾鍘熷洜code鏌ヨ鏁版嵁瀛楀吀
+ List<SDictData> SDictDataList = sDictDataService.selectByScrappedCodeList(scrappedCodeList);
+ Map<Long, String> scrappedNameMap = SDictDataList.stream().collect(Collectors.toMap(s -> s.getDict_code(), s -> s.getDict_label()));
+
+ for (DepFormScrappedModelParam depFormScrappedModelParam : modelList) {
+ DepFormScrappedModel depFormScrappedModel = new DepFormScrappedModel();
+ depFormScrappedModel.setId(NumberGenerator.getLongSequenceNumber());
+ depFormScrappedModel.setDepFormScrappedId(lWhFormScrappedId);
+ depFormScrappedModel.setDepFormScrappedGoodsId(depFormScrappedGoods.getId());
+ //鎶ュ簾鍘熷洜
+ depFormScrappedModel.setScrappedCode(depFormScrappedModelParam.getScrappedCode());
+ depFormScrappedModel.setScrappedName(scrappedNameMap.get(depFormScrappedModel.getScrappedCode()));
+
+ // 鐗╁搧 鍙� 鍨嬪彿 淇℃伅
+ Long baseGoodsModelsId = depFormScrappedModelParam.getBaseGoodsModelsId();
+ if (baseGoodsModelsId == null) {
+ return ResponseValue.error("鎶ュ簾鍗曠墿鍝佸瀷鍙蜂笉鑳戒负绌�");
+ }
+ List<Map<String, Object>> modelInfoList = baseGoodsModelsService.queryGoodsModelInfo(baseGoodsModelsId);
+ if (CollectionUtils.isEmpty(modelInfoList)) {
+ return ResponseValue.error("鏈煡璇㈠埌鎶ュ簾鍗曠墿鍝佸瀷鍙�");
+ }
+ Map<String, Object> modelInfo = modelInfoList.get(0);
+ depFormScrappedModel.setBaseGoodsTemplateId(Convert.toLong(modelInfo.get("goodsId")));
+ depFormScrappedModel.setBaseGoodsTemplateName(Convert.toStr(modelInfo.get("goodsName")));
+ depFormScrappedModel.setClassification(Convert.toStr(modelInfo.get("type")));
+ depFormScrappedModel.setUnit(Convert.toStr(modelInfo.get("unit")));
+ depFormScrappedModel.setBaseGoodsModelsId(baseGoodsModelsId);
+ depFormScrappedModel.setBaseGoodsModelsName(Convert.toStr(modelInfo.get("modelName")));
+
+ //璋冩嫧鍗曚俊鎭�
+ depFormScrappedModel.setProcureModelUserId(depFormScrappedModelParam.getModelUserId());
+ depFormScrappedModel.setGoodsUserName(depFormScrappedModelParam.getNowUserName());
+ depFormScrappedModel.setInitialCount(depFormScrappedModelParam.getGoodsNum());
+ depFormScrappedModel.setUseCount(depFormScrappedModelParam.getUserUseCount());
+ depFormScrappedModel.setCounts(depFormScrappedModelParam.getCounts());
+
+ //澧炲姞鍒版壒閲忔彃鍏ist
+ modelArrayList.add(depFormScrappedModel);
+ }
+ //澧炲姞鍒版壒閲忔彃鍏ist
+ scrappedGoodsArrayList.add(depFormScrappedGoods);
+ }
+
+ int flag1 = this.insert(lDeptFormScrapped);
+ if (flag1 == 0) {
+ log.error("鏂板鎶ュ簾鍗曞け璐�");
+ return ResponseValue.error("鏂板鎶ュ簾鍗曞け璐�");
+ }
+ int i = insertBatch(scrappedGoodsArrayList);
+ int i2 = insertBatch(modelArrayList);
+ return ResponseValue.success();
+ }
+
+
+ /**
+ * @Description 鍒楄〃鏌ヨ
+ */
+ private static String QUERY_LIST = "SELECT scrap.id,scrap.BUSINESS_FORM_CODE,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,model.BASE_GOODS_TEMPLATE_ID,model.BASE_GOODS_TEMPLATE_NAME,SUM(model.COUNTS) total_Count FROM DEP_FORM_SCRAPPED scrap LEFT JOIN DEP_FORM_SCRAPPED_MODEL model ON scrap.id=model.DEP_FORM_SCRAPPED_ID where 1=1";
+ private static String QUERY_LIST_END = " GROUP BY scrap.id,scrap.BUSINESS_FORM_CODE,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,model.BASE_GOODS_TEMPLATE_ID,model.BASE_GOODS_TEMPLATE_NAME ORDER BY scrap.DEAL_TIME DESC";
+
+ public GenericPager<Map<String, Object>> queryList(LDeptFormScrappedQry param) {
+ HashMap<String, Object> paramts = new HashMap<>();
+ StringBuilder sql = new StringBuilder(QUERY_LIST);
+ //鎶ュ簾鍗曞彿
+ if (!StringUtils.isEmpty(param.getBusinessFormCode())) {
+ sql.append(" and scrap.BUSINESS_FORM_CODE = :businessFormCode ");
+ paramts.put("businessFormCode", param.getBusinessFormCode());
+ }
+ //鏈烘瀯
+ sql.append(" and scrap.AGENCY_ID = :agencyId ");
+ if (param.getAgencyId() != null) {
+ paramts.put("agencyId", param.getAgencyId());
+ }
+ //鐗╁搧鍚嶇О
+ if (!StringUtils.isEmpty(param.getGoodsTemplateName())) {
+ sql.append(" and model.BASE_GOODS_TEMPLATE_NAME LIKE :goodsTemplateName ");
+ paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ }
+ //鍒涘缓浜�
+ if (!StringUtils.isEmpty(param.getOperatorName())) {
+ sql.append(" and scrap.OPERATOR_NAME LIKE :operatorName ");
+ paramts.put("operatorName", StringUtils.CHAR_PERCENT + param.getOperatorName() + StringUtils.CHAR_PERCENT);
+ }
+ //鎶ュ簾鏃堕棿
+ if (param.getStartTime() != null) {
+ sql.append(" and scrap.DEAL_TIME >=:dealTimeStart ");
+ paramts.put("dealTimeStart", param.getStartTime() * 1000000);
+ }
+ if (param.getEndTime() != null) {
+ sql.append(" and scrap.DEAL_TIME <:dealTimeEnd ");
+ paramts.put("dealTimeEnd", param.getEndTime() * 1000000 + 240000);
+ }
+ sql.append(QUERY_LIST_END);
+ return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
+ }
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java b/consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java
index 5b8b6e3..29696b9 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java
@@ -49,7 +49,7 @@
* @return
*/
private static String GET_FF_ORDER_BY_GOODS_ID_AND_DEPT = "SELECT trans.ID TRANS_BUSINESS_ID,trans.BUSINESS_FORM_CODE,baseTemp.ID BASE_GOODS_TEMPLATE_ID,baseTemp.GOODS_NAME BASE_GOODS_TEMPLATE_NAME,sum(proModel.COUNTS) total_count,sum(proModel.USE_COUNT) use_count,trans.IN_TIME FROM L_WH_FORM_TRANSFER trans LEFT JOIN L_WH_PROCURE_MODEL proModel ON proModel.BUSINESS_ID=trans.id LEFT JOIN BASE_GOODS_MODELS baseModel ON proModel.BASE_GOODS_MODELS_ID=baseModel.id LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseTemp.id=baseModel.GOODS_TEMPLATES_ID WHERE proModel.BUSINESS_TYPE=4 AND proModel.USE_COUNT> 0 ";
- private static String GET_FF_ORDER_BY_GOODS_ID_AND_DEPT_END = " GROUP BY trans.ID,trans.BUSINESS_FORM_CODE,baseTemp.ID,baseTemp.GOODS_NAME,trans.IN_TIME";
+ private static String GET_FF_ORDER_BY_GOODS_ID_AND_DEPT_END = " GROUP BY trans.ID,trans.BUSINESS_FORM_CODE,baseTemp.ID,baseTemp.GOODS_NAME,trans.IN_TIME order by trans.BUSINESS_FORM_CODE desc";
public List<Map<String, Object>> getFfOrderByGoodsIdAndDept(Long goodsTemplateId, Long departmentId) {
StringBuilder sql = new StringBuilder(GET_FF_ORDER_BY_GOODS_ID_AND_DEPT);
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 4488427..32cac01 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
@@ -2,6 +2,7 @@
import com.consum.model.po.SDictData;
import com.walker.jdbc.service.BaseServiceImpl;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -12,11 +13,11 @@
public class SDictDataServiceImpl extends BaseServiceImpl {
/**
- * @Description 鏍规嵁鎶ュ簾鍘熷洜code鏌ヨ鏁版嵁瀛楀吀
+ * @Description 鏍规嵁鎶ュ簾鍘熷洜code鏌ヨ鏁版嵁瀛楀吀
* @Author 鍗㈠簡闃�
* @Date 2023/11/2
*/
- public List<SDictData> selectByScrappedCodeList(List<String> scrappedCodeList) {
+ public List<SDictData> selectByScrappedCodeList(List scrappedCodeList) {
if (CollectionUtils.isEmpty(scrappedCodeList)) {
log.error("鍙傛暟閿欒");
return null;
@@ -24,14 +25,16 @@
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(" ) ");
+ sql.append(" and dict_code in ( ").append(
+ StringUtils.join(scrappedCodeList, ",")).append(")");
+
+// 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 SDictData());
}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrapped.java b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrapped.java
index 370cfd9..e052691 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrapped.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrapped.java
@@ -53,11 +53,19 @@
@JsonIgnore
protected boolean isset_dealTime = false;
- private String departmentId = null;
+ private Long agencyId = null;
+ @JsonIgnore
+ protected boolean isset_agencyId = false;
+
+ private String agencyName = null;
+ @JsonIgnore
+ protected boolean isset_agencyName = false;
+
+ private Long departmentId = null;
@JsonIgnore
protected boolean isset_departmentId = false;
- private Long departmentName = null;
+ private String departmentName = null;
@JsonIgnore
protected boolean isset_departmentName = false;
@@ -220,32 +228,60 @@
return this.dealTime == null;
}
- public String getDepartmentId() {
+ public Long getAgencyId() {
+ return this.agencyId;
+ }
+
+ public void setAgencyId(Long agencyId) {
+ this.agencyId = agencyId;
+ this.isset_agencyId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyAgencyId() {
+ return this.agencyId == null;
+ }
+
+ public String getAgencyName() {
+ return this.agencyName;
+ }
+
+ public void setAgencyName(String agencyName) {
+ this.agencyName = agencyName;
+ this.isset_agencyName = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyAgencyName() {
+ return this.agencyName == null || this.agencyName.length() == 0;
+ }
+
+ public Long getDepartmentId() {
return this.departmentId;
}
- public void setDepartmentId(String departmentId) {
+ public void setDepartmentId(Long departmentId) {
this.departmentId = departmentId;
this.isset_departmentId = true;
}
@JsonIgnore
public boolean isEmptyDepartmentId() {
- return this.departmentId == null || this.departmentId.length() == 0;
+ return this.departmentId == null;
}
- public Long getDepartmentName() {
+ public String getDepartmentName() {
return this.departmentName;
}
- public void setDepartmentName(Long departmentName) {
+ public void setDepartmentName(String departmentName) {
this.departmentName = departmentName;
this.isset_departmentName = true;
}
@JsonIgnore
public boolean isEmptyDepartmentName() {
- return this.departmentName == null;
+ return this.departmentName == null || this.departmentName.length() == 0;
}
public Long getCreateTime() {
@@ -305,6 +341,8 @@
.append("operatorId=").append(this.operatorId)
.append("operatorName=").append(this.operatorName)
.append("dealTime=").append(this.dealTime)
+ .append("agencyId=").append(this.agencyId)
+ .append("agencyName=").append(this.agencyName)
.append("departmentId=").append(this.departmentId)
.append("departmentName=").append(this.departmentName)
.append("createTime=").append(this.createTime)
@@ -351,6 +389,12 @@
if (this.isset_dealTime) {
dep_form_scrapped.setDealTime(this.getDealTime());
}
+ if (this.isset_agencyId) {
+dep_form_scrapped.setAgencyId(this.getAgencyId());
+ }
+ if (this.isset_agencyName) {
+dep_form_scrapped.setAgencyName(this.getAgencyName());
+ }
if (this.isset_departmentId) {
dep_form_scrapped.setDepartmentId(this.getDepartmentId());
}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedModel.java b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedModel.java
index 38d4545..aee5ca9 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedModel.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedModel.java
@@ -29,7 +29,7 @@
@JsonIgnore
protected boolean isset_depFormScrappedGoodsId = false;
- private String scrappedCode = null;
+ private Long scrappedCode = null;
@JsonIgnore
protected boolean isset_scrappedCode = false;
@@ -148,18 +148,18 @@
return this.depFormScrappedGoodsId == null;
}
- public String getScrappedCode() {
+ public Long getScrappedCode() {
return this.scrappedCode;
}
- public void setScrappedCode(String scrappedCode) {
+ public void setScrappedCode(Long scrappedCode) {
this.scrappedCode = scrappedCode;
this.isset_scrappedCode = true;
}
@JsonIgnore
public boolean isEmptyScrappedCode() {
- return this.scrappedCode == null || this.scrappedCode.length() == 0;
+ return this.scrappedCode == null;
}
public String getScrappedName() {
@@ -374,63 +374,63 @@
* 鍏嬮殕
*/
public DepFormScrappedModel $clone() {
- DepFormScrappedModel dep_form_scrapped_model = new DepFormScrappedModel();
+DepFormScrappedModel dep_form_scrapped_model = new DepFormScrappedModel();
// 鏁版嵁搴撳悕绉�
//dep_form_scrapped_model.setDatabaseName_(this.getDatabaseName_());
// 涓婚敭
if (this.isset_id) {
- dep_form_scrapped_model.setId(this.getId());
+dep_form_scrapped_model.setId(this.getId());
}
// 鏅�氬睘鎬�
if (this.isset_depFormScrappedId) {
- dep_form_scrapped_model.setDepFormScrappedId(this.getDepFormScrappedId());
+dep_form_scrapped_model.setDepFormScrappedId(this.getDepFormScrappedId());
}
if (this.isset_depFormScrappedGoodsId) {
- dep_form_scrapped_model.setDepFormScrappedGoodsId(this.getDepFormScrappedGoodsId());
+dep_form_scrapped_model.setDepFormScrappedGoodsId(this.getDepFormScrappedGoodsId());
}
if (this.isset_scrappedCode) {
- dep_form_scrapped_model.setScrappedCode(this.getScrappedCode());
+dep_form_scrapped_model.setScrappedCode(this.getScrappedCode());
}
if (this.isset_scrappedName) {
- dep_form_scrapped_model.setScrappedName(this.getScrappedName());
+dep_form_scrapped_model.setScrappedName(this.getScrappedName());
}
if (this.isset_baseGoodsTemplateId) {
- dep_form_scrapped_model.setBaseGoodsTemplateId(this.getBaseGoodsTemplateId());
+dep_form_scrapped_model.setBaseGoodsTemplateId(this.getBaseGoodsTemplateId());
}
if (this.isset_baseGoodsTemplateName) {
- dep_form_scrapped_model.setBaseGoodsTemplateName(this.getBaseGoodsTemplateName());
+dep_form_scrapped_model.setBaseGoodsTemplateName(this.getBaseGoodsTemplateName());
}
if (this.isset_classification) {
- dep_form_scrapped_model.setClassification(this.getClassification());
+dep_form_scrapped_model.setClassification(this.getClassification());
}
if (this.isset_unit) {
- dep_form_scrapped_model.setUnit(this.getUnit());
+dep_form_scrapped_model.setUnit(this.getUnit());
}
if (this.isset_baseGoodsModelsId) {
- dep_form_scrapped_model.setBaseGoodsModelsId(this.getBaseGoodsModelsId());
+dep_form_scrapped_model.setBaseGoodsModelsId(this.getBaseGoodsModelsId());
}
if (this.isset_baseGoodsModelsName) {
- dep_form_scrapped_model.setBaseGoodsModelsName(this.getBaseGoodsModelsName());
+dep_form_scrapped_model.setBaseGoodsModelsName(this.getBaseGoodsModelsName());
}
if (this.isset_procureModelUserId) {
- dep_form_scrapped_model.setProcureModelUserId(this.getProcureModelUserId());
+dep_form_scrapped_model.setProcureModelUserId(this.getProcureModelUserId());
}
if (this.isset_initialCount) {
- dep_form_scrapped_model.setInitialCount(this.getInitialCount());
+dep_form_scrapped_model.setInitialCount(this.getInitialCount());
}
if (this.isset_useCount) {
- dep_form_scrapped_model.setUseCount(this.getUseCount());
+dep_form_scrapped_model.setUseCount(this.getUseCount());
}
if (this.isset_counts) {
- dep_form_scrapped_model.setCounts(this.getCounts());
+dep_form_scrapped_model.setCounts(this.getCounts());
}
if (this.isset_goodsUserName) {
- dep_form_scrapped_model.setGoodsUserName(this.getGoodsUserName());
+dep_form_scrapped_model.setGoodsUserName(this.getGoodsUserName());
}
if (this.isset_beiz) {
- dep_form_scrapped_model.setBeiz(this.getBeiz());
+dep_form_scrapped_model.setBeiz(this.getBeiz());
}
return dep_form_scrapped_model;
}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedModel_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedModel_mapper.java
index 1927f70..f1dd9c7 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedModel_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedModel_mapper.java
@@ -7,6 +7,8 @@
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;
@@ -115,12 +117,12 @@
public String getTableName_() {
String tableName = "dep_form_scrapped_model";
/**
- if (StringUtils.isNotEmpty(this.getDatabaseName_())) {
- return this.getDatabaseName_() + "." + tableName;
- } else {
- return tableName;
- }
- */
+ if (StringUtils.isNotEmpty(this.getDatabaseName_())) {
+ return this.getDatabaseName_() + "." + tableName;
+ } else {
+ return tableName;
+ }
+ */
return tableName;
}
@@ -323,109 +325,113 @@
@Override
public DepFormScrappedModel mapRow(ResultSet rs, int i) throws SQLException {
ResultSetUtils resultSetUtils = new ResultSetUtils();
- DepFormScrappedModel dep_form_scrapped_model = new DepFormScrappedModel();
+DepFormScrappedModel dep_form_scrapped_model = new DepFormScrappedModel();
Integer columnIndex;
//涓婚敭
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.Id);
if (columnIndex > 0) {
- dep_form_scrapped_model.setId(rs.getLong(columnIndex));
+dep_form_scrapped_model.setId(rs.getLong(columnIndex));
}
//鏅�氬睘鎬�
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.DepFormScrappedId);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- dep_form_scrapped_model.setDepFormScrappedId(null);
+dep_form_scrapped_model.setDepFormScrappedId(null);
} else {
- dep_form_scrapped_model.setDepFormScrappedId(rs.getLong(columnIndex));
+dep_form_scrapped_model.setDepFormScrappedId(rs.getLong(columnIndex));
}
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.DepFormScrappedGoodsId);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- dep_form_scrapped_model.setDepFormScrappedGoodsId(null);
+dep_form_scrapped_model.setDepFormScrappedGoodsId(null);
} else {
- dep_form_scrapped_model.setDepFormScrappedGoodsId(rs.getLong(columnIndex));
+dep_form_scrapped_model.setDepFormScrappedGoodsId(rs.getLong(columnIndex));
}
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.ScrappedCode);
if (columnIndex > 0) {
- dep_form_scrapped_model.setScrappedCode(rs.getString(columnIndex));
+ if (rs.getBigDecimal(columnIndex) == null) {
+dep_form_scrapped_model.setScrappedCode(null);
+ } else {
+dep_form_scrapped_model.setScrappedCode(rs.getLong(columnIndex));
+ }
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.ScrappedName);
if (columnIndex > 0) {
- dep_form_scrapped_model.setScrappedName(rs.getString(columnIndex));
+dep_form_scrapped_model.setScrappedName(rs.getString(columnIndex));
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.BaseGoodsTemplateId);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- dep_form_scrapped_model.setBaseGoodsTemplateId(null);
+dep_form_scrapped_model.setBaseGoodsTemplateId(null);
} else {
- dep_form_scrapped_model.setBaseGoodsTemplateId(rs.getLong(columnIndex));
+dep_form_scrapped_model.setBaseGoodsTemplateId(rs.getLong(columnIndex));
}
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.BaseGoodsTemplateName);
if (columnIndex > 0) {
- dep_form_scrapped_model.setBaseGoodsTemplateName(rs.getString(columnIndex));
+dep_form_scrapped_model.setBaseGoodsTemplateName(rs.getString(columnIndex));
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.Classification);
if (columnIndex > 0) {
- dep_form_scrapped_model.setClassification(rs.getString(columnIndex));
+dep_form_scrapped_model.setClassification(rs.getString(columnIndex));
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.Unit);
if (columnIndex > 0) {
- dep_form_scrapped_model.setUnit(rs.getString(columnIndex));
+dep_form_scrapped_model.setUnit(rs.getString(columnIndex));
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.BaseGoodsModelsId);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- dep_form_scrapped_model.setBaseGoodsModelsId(null);
+dep_form_scrapped_model.setBaseGoodsModelsId(null);
} else {
- dep_form_scrapped_model.setBaseGoodsModelsId(rs.getLong(columnIndex));
+dep_form_scrapped_model.setBaseGoodsModelsId(rs.getLong(columnIndex));
}
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.BaseGoodsModelsName);
if (columnIndex > 0) {
- dep_form_scrapped_model.setBaseGoodsModelsName(rs.getString(columnIndex));
+dep_form_scrapped_model.setBaseGoodsModelsName(rs.getString(columnIndex));
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.ProcureModelUserId);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- dep_form_scrapped_model.setProcureModelUserId(null);
+dep_form_scrapped_model.setProcureModelUserId(null);
} else {
- dep_form_scrapped_model.setProcureModelUserId(rs.getLong(columnIndex));
+dep_form_scrapped_model.setProcureModelUserId(rs.getLong(columnIndex));
}
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.InitialCount);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- dep_form_scrapped_model.setInitialCount(null);
+dep_form_scrapped_model.setInitialCount(null);
} else {
- dep_form_scrapped_model.setInitialCount(rs.getInt(columnIndex));
+dep_form_scrapped_model.setInitialCount(rs.getInt(columnIndex));
}
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.UseCount);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- dep_form_scrapped_model.setUseCount(null);
+dep_form_scrapped_model.setUseCount(null);
} else {
- dep_form_scrapped_model.setUseCount(rs.getInt(columnIndex));
+dep_form_scrapped_model.setUseCount(rs.getInt(columnIndex));
}
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.Counts);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- dep_form_scrapped_model.setCounts(null);
+dep_form_scrapped_model.setCounts(null);
} else {
- dep_form_scrapped_model.setCounts(rs.getInt(columnIndex));
+dep_form_scrapped_model.setCounts(rs.getInt(columnIndex));
}
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.GoodsUserName);
if (columnIndex > 0) {
- dep_form_scrapped_model.setGoodsUserName(rs.getString(columnIndex));
+dep_form_scrapped_model.setGoodsUserName(rs.getString(columnIndex));
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.Beiz);
if (columnIndex > 0) {
- dep_form_scrapped_model.setBeiz(rs.getString(columnIndex));
+dep_form_scrapped_model.setBeiz(rs.getString(columnIndex));
}
return dep_form_scrapped_model;
}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrapped_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrapped_mapper.java
index 2747ad5..97577cd 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrapped_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrapped_mapper.java
@@ -7,6 +7,8 @@
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;
@@ -35,6 +37,8 @@
public static final String OperatorId = "operator_id";
public static final String OperatorName = "operator_name";
public static final String DealTime = "deal_time";
+ public static final String AgencyId = "agency_id";
+ public static final String AgencyName = "agency_name";
public static final String DepartmentId = "department_id";
public static final String DepartmentName = "department_name";
public static final String CreateTime = "create_time";
@@ -76,6 +80,12 @@
}
if (depFormScrapped.isset_dealTime) {
this.setDealTime(depFormScrapped.getDealTime());
+ }
+ if (depFormScrapped.isset_agencyId) {
+ this.setAgencyId(depFormScrapped.getAgencyId());
+ }
+ if (depFormScrapped.isset_agencyName) {
+ this.setAgencyName(depFormScrapped.getAgencyName());
}
if (depFormScrapped.isset_departmentId) {
this.setDepartmentId(depFormScrapped.getDepartmentId());
@@ -143,6 +153,8 @@
ib.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
ib.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
ib.set(DealTime, this.getDealTime(), this.isset_dealTime);
+ ib.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
+ ib.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
ib.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId);
ib.set(DepartmentName, this.getDepartmentName(), this.isset_departmentName);
ib.set(CreateTime, this.getCreateTime(), this.isset_createTime);
@@ -165,6 +177,8 @@
ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
+ ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
+ ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
ub.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId);
ub.set(DepartmentName, this.getDepartmentName(), this.isset_departmentName);
ub.set(CreateTime, this.getCreateTime(), this.isset_createTime);
@@ -188,6 +202,8 @@
ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
+ ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
+ ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
ub.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId);
ub.set(DepartmentName, this.getDepartmentName(), this.isset_departmentName);
ub.set(CreateTime, this.getCreateTime(), this.isset_createTime);
@@ -210,6 +226,8 @@
ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
+ ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
+ ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
ub.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId);
ub.set(DepartmentName, this.getDepartmentName(), this.isset_departmentName);
ub.set(CreateTime, this.getCreateTime(), this.isset_createTime);
@@ -262,7 +280,7 @@
*/
@Override
public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
- return new SqlAndParameters<>("select id, business_form_code, procure_doc, out_warehouse_type, out_warehouse_id, out_warehouse_name, operator_id, operator_name, deal_time, department_id, department_name, create_time, states, beiz from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, business_form_code, procure_doc, out_warehouse_type, out_warehouse_id, out_warehouse_name, operator_id, operator_name, deal_time, agency_id, agency_name, department_id, department_name, create_time, states, beiz from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -270,7 +288,7 @@
*/
@Override
public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
- return new SqlAndParameters<>("select id, business_form_code, procure_doc, out_warehouse_type, out_warehouse_id, out_warehouse_name, operator_id, operator_name, deal_time, department_id, department_name, create_time, states, beiz from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, business_form_code, procure_doc, out_warehouse_type, out_warehouse_id, out_warehouse_name, operator_id, operator_name, deal_time, agency_id, agency_name, department_id, department_name, create_time, states, beiz from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -355,17 +373,29 @@
dep_form_scrapped.setDealTime(rs.getLong(columnIndex));
}
}
+ columnIndex = resultSetUtils.findColumn(rs, DepFormScrapped_mapper.AgencyId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+dep_form_scrapped.setAgencyId(null);
+ } else {
+dep_form_scrapped.setAgencyId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, DepFormScrapped_mapper.AgencyName);
+ if (columnIndex > 0) {
+dep_form_scrapped.setAgencyName(rs.getString(columnIndex));
+ }
columnIndex = resultSetUtils.findColumn(rs, DepFormScrapped_mapper.DepartmentId);
if (columnIndex > 0) {
-dep_form_scrapped.setDepartmentId(rs.getString(columnIndex));
+ if (rs.getBigDecimal(columnIndex) == null) {
+dep_form_scrapped.setDepartmentId(null);
+ } else {
+dep_form_scrapped.setDepartmentId(rs.getLong(columnIndex));
+ }
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrapped_mapper.DepartmentName);
if (columnIndex > 0) {
- if (rs.getBigDecimal(columnIndex) == null) {
-dep_form_scrapped.setDepartmentName(null);
- } else {
-dep_form_scrapped.setDepartmentName(rs.getLong(columnIndex));
- }
+dep_form_scrapped.setDepartmentName(rs.getString(columnIndex));
}
columnIndex = resultSetUtils.findColumn(rs, DepFormScrapped_mapper.CreateTime);
if (columnIndex > 0) {
--
Gitblit v1.9.1