From 4ee56e307915e4e71baab476be819e7642e78269 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 08 十一月 2023 18:19:34 +0800
Subject: [PATCH] --部门物品分发与明细 --采购fix
---
consum-base/src/main/java/com/consum/base/pojo/RecordUserInfoDto.java | 24 +
consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserRecordServiceImpl.java | 2
consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java | 187 ++++++++-
consum-base/src/main/java/com/consum/base/controller/DepFormLendingController.java | 47 ++
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 231 ++++++++++-
consum-model-pojo/src/main/java/com/consum/model/vo/LWhFormTransferVo.java | 10
consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java | 39 +
consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java | 16
consum-base/src/main/java/com/consum/base/pojo/query/TransferQryDto.java | 97 ++++
consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java | 19
consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java | 31 +
consum-base/src/main/java/com/consum/base/pojo/LWhProcureModelParams.java | 23 +
consum-model-pojo/src/main/java/com/consum/model/po/WhFormTransfer_mapper.java | 84 +++
consum-model-pojo/src/main/java/com/consum/model/vo/LWhProcureModelVo.java | 54 ++
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 38 +
consum-base/src/main/java/com/consum/base/pojo/LWhFormTransferParam.java | 21
consum-model-pojo/src/main/java/com/consum/model/vo/TransferInfoDetailsVo.java | 42 ++
consum-base/src/main/java/com/consum/base/pojo/UseRecordDto.java | 25 +
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java | 22
consum-base/src/main/java/com/consum/base/pojo/ProcureModelInfoDto.java | 32 +
consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserServiceImpl.java | 11
consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java | 24
consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java | 2
consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureParam.java | 11
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 2
consum-base/src/main/java/com/consum/base/pojo/LWhProcureModelUserDTO.java | 45 ++
consum-base/src/main/java/com/consum/base/pojo/UseRecordSkuDto.java | 37 +
27 files changed, 1,022 insertions(+), 154 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
index ca157b1..bfb806f 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
@@ -5,20 +5,23 @@
import com.consum.base.pojo.ProjectTreeResult;
import com.consum.base.service.BaseCategoryServiceImpl;
import com.consum.base.service.BaseGoodsTemplateServiceImpl;
-import com.consum.base.util.FinSysTenantUtils;
import com.consum.model.po.BaseCategory;
-import com.consum.model.po.FinSysTenant;
-import com.consum.model.po.FinSysTenantUser;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.tree.TreeNode;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* @Description 鐗╁搧鍒嗙被
@@ -91,6 +94,7 @@
return ResponseValue.success(pager);
}
+
/**
* @Description 缂栬緫
* @Author 鍗㈠簡闃�
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 3216db6..e4ce6b3 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
@@ -1,22 +1,20 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
-import com.consum.base.pojo.BaseCategoryParam;
-import com.consum.base.service.BaseCategoryServiceImpl;
import com.consum.base.service.BaseGoodsModelsServiceImpl;
-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;
import com.walker.web.ResponseValue;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* @Description 瑙勬牸鍨嬪彿
@@ -110,6 +108,19 @@
return ResponseValue.success(list);
}
-
+ @GetMapping("query/goodsModel")
+ public ResponseValue queryGoodsModelByGoodsTemplatesId(Long goodsTemplatesId) {
+// S_user_core currentUser = this.getCurrentUser();
+// if (currentUser == null) {
+// return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+// }
+// if (goodsTemplatesId == null) {
+// return ResponseValue.error("鐗╁搧id涓嶅瓨鍦�");
+// }
+ BaseGoodsModels baseGoodsModels = new BaseGoodsModels();
+ baseGoodsModels.setGoodsTemplatesId(goodsTemplatesId);
+ List<BaseGoodsModels> result = this.baseGoodsModelsService.select(baseGoodsModels);
+ return ResponseValue.success(result);
+ }
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
index 622309e..5e00c1a 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
@@ -11,11 +11,15 @@
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
+import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* @Description 鐗╁搧妯℃澘
@@ -49,7 +53,9 @@
}
int result = this.baseGoodsTemplateService.add(param, this.getCurrentUser());
- if (result > 0) return ResponseValue.success(1);
+ if (result > 0) {
+ return ResponseValue.success(1);
+ }
return ResponseValue.error("鏂板澶辫触锛�");
}
@@ -70,6 +76,7 @@
/**
* 鏍规嵁鐗╁搧id鏌ヨ鐗╁搧璇︽儏
+ *
* @author 鍗㈠簡闃�
* @date 2023/9/26
*/
@@ -79,7 +86,9 @@
return ResponseValue.error("鐗╁搧id涓虹┖");
}
BaseGoodsTemplateVo vo = this.baseGoodsTemplateService.getById(id);
- if (vo == null) return ResponseValue.error("鏌ヨ澶辫触锛�");
+ if (vo == null) {
+ return ResponseValue.error("鏌ヨ澶辫触锛�");
+ }
return ResponseValue.success("鏌ヨ鎴愬姛!", vo);
}
@@ -104,6 +113,7 @@
/**
* 淇敼鐘舵��
+ *
* @author 鍗㈠簡闃�
* @date 2023/10/25
*/
@@ -129,13 +139,13 @@
if (goodsTemplate.getId() == null) {
return ResponseValue.error("鐗╁搧id涓虹┖");
}
- int num = this.baseGoodsTemplateService.updateById(goodsTemplate,this.getCurrentUser());
+ int num = this.baseGoodsTemplateService.updateById(goodsTemplate, this.getCurrentUser());
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
}
/**
- * @Description 鏌ヨ浠撳簱绫诲瀷(鏁版嵁瀛楀吀)
+ * @Description 鏌ヨ浠撳簱绫诲瀷(鏁版嵁瀛楀吀)
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
@@ -146,7 +156,7 @@
}
/**
- * @Description 鏍规嵁鍒嗙被id鏌ヨ鐗╁搧妯℃澘
+ * @Description 鏍规嵁鍒嗙被id鏌ヨ鐗╁搧妯℃澘
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
@@ -156,8 +166,17 @@
return ResponseValue.success(list);
}
-
-
+ @GetMapping("/query/goodsTemplate")
+ public ResponseValue getByAgencyId(Long agencyId) {
+ if (agencyId == null) {
+ return ResponseValue.error("鏈烘瀯id涓虹┖");
+ }
+ List<BaseGoodsTemplate> list = this.baseGoodsTemplateService.queryByAgencyId(agencyId);
+ if (list == null) {
+ return ResponseValue.error("鏌ヨ澶辫触锛�");
+ }
+ return ResponseValue.success("鏌ヨ鎴愬姛!", list);
+ }
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
index bfc7dbc..f6bb989 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
@@ -2,18 +2,19 @@
import com.consum.base.BaseController;
import com.consum.base.pojo.BaseWarehouseParam;
-import com.consum.base.pojo.FinSysTenantDepartmentParam;
import com.consum.base.service.BaseWarehouseServiceImpl;
import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantDepartment;
-import com.consum.model.po.FinSysTenantUser;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* @Description 浠撳簱绠＄悊
@@ -40,7 +41,9 @@
//TODO 鍔犳潈闄� 鐪佺骇绠＄悊鍛樺綍鍏ユ墍鏈変粨搴撲俊鎭�
int result = this.baseWarehouseService.add(param);
- if (result > 0) return ResponseValue.success(1);
+ if (result > 0) {
+ return ResponseValue.success(1);
+ }
return ResponseValue.error("鏂板澶辫触锛�");
}
@@ -80,6 +83,7 @@
/**
* 鏍规嵁浠撳簱id鏌ヨ浠撳簱璇︽儏
+ *
* @author 鍗㈠簡闃�
* @Date 2023/10/26
*/
@@ -89,7 +93,9 @@
return ResponseValue.error("浠撳簱id涓虹┖");
}
BaseWarehouse baseWarehouse = this.baseWarehouseService.getById(id);
- if (baseWarehouse == null) return ResponseValue.error("鏌ヨ澶辫触锛�");
+ if (baseWarehouse == null) {
+ return ResponseValue.error("鏌ヨ澶辫触锛�");
+ }
return ResponseValue.success("鏌ヨ鎴愬姛!", baseWarehouse);
}
@@ -115,7 +121,7 @@
*/
@GetMapping("/select/userList")
public ResponseValue queryList(Long baseWarehouseId) {
- if (baseWarehouseId == null){
+ if (baseWarehouseId == null) {
return ResponseValue.error("浠撳簱id涓虹┖");
}
this.baseWarehouseService.queryUserList(baseWarehouseId);
@@ -123,20 +129,22 @@
}
/**
- * @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
+ * @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
@GetMapping("/select/tenant_warehouse")
public ResponseValue getByAgencyId(Long agencyId) {
- if (agencyId == null) {
- return ResponseValue.error("鏈烘瀯id涓虹┖");
- }
+ // TODO 鏆傛棤鏈烘瀯
+// if (agencyId == null) {
+// return ResponseValue.error("鏈烘瀯id涓虹┖");
+// }
List<BaseWarehouse> list = this.baseWarehouseService.getByAgencyId(agencyId);
- if (list == null) return ResponseValue.error("鏌ヨ澶辫触锛�");
+ if (list == null) {
+ return ResponseValue.error("鏌ヨ澶辫触锛�");
+ }
return ResponseValue.success("鏌ヨ鎴愬姛!", list);
}
-
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java
index e5021f9..fad1776 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java
@@ -1,27 +1,21 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
-import com.consum.base.pojo.BaseCategoryParam;
-import com.consum.base.pojo.BaseWarehouseParam;
-import com.consum.base.service.BaseCategoryServiceImpl;
-import com.consum.base.service.BaseGoodsTemplateServiceImpl;
import com.consum.base.service.BaseWarehouseManagerServiceImpl;
-import com.consum.model.po.BaseCategory;
import com.consum.model.po.BaseWarehouseManager;
-import com.iplatform.model.po.S_user_core;
-import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* @Description 搴撶鍛�
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
+ * <p>
+ * todo 搴撶鍛�
*/
@RestController
@RequestMapping("/pc/base/warehouse/manager")
@@ -38,7 +32,9 @@
@PostMapping("/add")
public ResponseValue add(@RequestBody BaseWarehouseManager baseWarehouseManager) {
int result = this.baseWarehouseManagerService.add(baseWarehouseManager);
- if (result > 0) return ResponseValue.success(1);
+ if (result > 0) {
+ return ResponseValue.success(1);
+ }
return ResponseValue.error("鏂板澶辫触锛�");
}
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/DepFormLendingController.java b/consum-base/src/main/java/com/consum/base/controller/DepFormLendingController.java
new file mode 100644
index 0000000..5f0c6d5
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/controller/DepFormLendingController.java
@@ -0,0 +1,47 @@
+package com.consum.base.controller;
+
+import com.consum.base.BaseController;
+import com.walker.web.ResponseValue;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: 鐗╁搧鍒嗗彂鍗�
+ * @date 2023/11/2 15:49 dep_form_lending
+ * TODO
+ */
+@RestController
+@RequestMapping("/pc/dep/from/lending")
+public class DepFormLendingController extends BaseController {
+
+
+ /**
+ * 娣诲姞鏁版嵁
+ *
+ * @param id 鏁版嵁ID
+ * @return 娣诲姞缁撴灉
+ */
+ @PostMapping("/add")
+ public ResponseValue add(String id) {
+ // code for adding data
+ return null;
+ }
+
+
+ @GetMapping("/list")
+ public ResponseValue list() {
+
+ return null;
+ }
+
+ @GetMapping("/{id}")
+ public ResponseValue detail(@PathVariable String id) {
+
+ return null;
+ }
+}
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 da51970..711d942 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
@@ -82,7 +82,7 @@
if (whFormProcureId == null) {
whFormProcureId = NumberGenerator.getLongSequenceNumber();
}
- long procureTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
+ long procureTime = DateUtils.getDateTimeNumber(param.getProcureTime());
Set<String> supplierList = new HashSet<>();
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 d8b2204..90ea3a0 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
@@ -1,32 +1,49 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
-import com.consum.base.core.CodeGeneratorEnum;
-import com.consum.base.core.CodeGeneratorService;
-import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.pojo.*;
-import com.consum.base.service.*;
-import com.consum.model.po.*;
+import com.consum.base.pojo.LWhFormTransferParam;
+import com.consum.base.pojo.LWhProcureModelParams;
+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.service.BaseGoodsModelsServiceImpl;
+import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.LWhFormTransferCoreService;
+import com.consum.base.service.LWhFormTransferServiceImpl;
+import com.consum.base.service.LWhProcureModelService;
+import com.consum.base.service.LWhProcureModelUserRecordServiceImpl;
+import com.consum.base.service.LWhProcureModelUserServiceImpl;
+import com.consum.base.util.IdUtil;
+import com.consum.model.po.BaseGoodsModels;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.LWhProcureModel;
+import com.consum.model.po.LWhProcureModelUser;
+import com.consum.model.po.LWhProcureModelUserRecord;
import com.consum.model.vo.LWhFormOutputVo;
import com.consum.model.vo.LWhFormTransferVo;
+import com.consum.model.vo.LWhProcureModelVo;
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.web.ResponseValue;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
import java.lang.reflect.Field;
import java.util.ArrayList;
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;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
- * @Description 璋冩嫧绠＄悊
+ * @Description 璋冩嫧绠＄悊
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
@@ -42,6 +59,12 @@
private LWhProcureModelService lWhProcureModelService;
@Autowired
private LWhFormTransferCoreService lWhFormTransferCoreService;
+ @Autowired
+ private LWhProcureModelUserServiceImpl lWhProcureModelUserService;
+ @Autowired
+ private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
+ @Autowired
+ private BaseGoodsModelsServiceImpl baseGoodsModelsService;
/**
* @Description 鏂板
@@ -56,20 +79,22 @@
if (CollectionUtils.isEmpty(transferGoods)) {
return ResponseValue.error("璋冩嫧鍗曚笉鑳戒负绌�");
}
- int result = this.lWhFormTransferService.add(param, currentUser,this.getSysInfo());
- if (result > 0) return ResponseValue.success(1);
+ int result = this.lWhFormTransferService.add(param, currentUser, this.getSysInfo());
+ if (result > 0) {
+ return ResponseValue.success(1);
+ }
return ResponseValue.error("鏂板澶辫触锛�");
}
/**
- * @Description 鍒楄〃鏌ヨ(璋冩嫧鏄庣粏)
+ * @Description 鍒楄〃鏌ヨ(璋冩嫧鏄庣粏)
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
// 1.鏌ヨ璋冩嫧鍗�
// 2.鏌ヨ鐗╁搧鍨嬪彿
@GetMapping("/list")
- public ResponseValue queryFormTransferList(LWhFormTransferParam param) {
+ public ResponseValue queryFormTransferList(TransferQryDto param) {
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -81,17 +106,47 @@
GenericPager genericPager = lWhFormTransferService.queryFormTransferList(param);
List<LWhFormTransfer> datas = genericPager.getDatas();
- ArrayList<LWhFormTransferExtend> newDatas = new ArrayList<>();
+ ArrayList<LWhFormTransferVo> newDatas = new ArrayList<>();
if (!CollectionUtils.isEmpty(datas)) {
datas.forEach(item -> {
// 鏌ヨ鍨嬪彿鏁伴噺
LWhProcureModel lWhProcureModel = new LWhProcureModel();
- lWhProcureModel.setBusinessType(2);
+ Integer businessType = item.getBusinessType();
+ // TODO 璋冩嫧=0 鍒嗗彂=1 閫�鍥�=2
+ switch (businessType) {
+ case 0:
+ lWhProcureModel.setBusinessType(2);
+ break;
+ case 1:
+ lWhProcureModel.setBusinessType(4);
+ break;
+ }
lWhProcureModel.setBusinessId(item.getId());
- List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel);
- LWhFormTransferExtend formTransferExtend = new LWhFormTransferExtend();
+
+ LWhFormTransferVo formTransferExtend = new LWhFormTransferVo();
BeanUtils.copyProperties(item, formTransferExtend);
- formTransferExtend.setModels(models);
+
+ List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel);
+ List<LWhProcureModelVo> lWhProcureModelVoList = new ArrayList<>();
+ if (!CollectionUtils.isEmpty(models)) {
+ models.forEach(model -> {
+ LWhProcureModelVo lWhProcureModelVo = new LWhProcureModelVo();
+ BeanUtils.copyProperties(model, lWhProcureModelVo);
+
+ Long baseGoodsModelsId = model.getBaseGoodsModelsId();
+ Long businessId = model.getBusinessId();
+ Long id = model.getId();
+ LWhProcureModelUser lWhFormTransferUser = new LWhProcureModelUser();
+ lWhFormTransferUser.setTransBusinessId(businessId);
+ lWhFormTransferUser.setWhProcureModelId(id);
+ lWhFormTransferUser.setBaseGoodsModelsId(baseGoodsModelsId);
+ List<LWhProcureModelUser> procureModelUserList = lWhProcureModelUserService.select(lWhFormTransferUser);
+ lWhProcureModelVo.setProcureModelUsersList(procureModelUserList);
+ lWhProcureModelVoList.add(lWhProcureModelVo);
+ });
+ }
+
+ formTransferExtend.setModels(lWhProcureModelVoList);
newDatas.add(formTransferExtend);
});
}
@@ -102,12 +157,11 @@
} catch (Exception e) {
e.printStackTrace();
}
-// genericPager.setDatas(newDatas);
return ResponseValue.success(genericPager);
}
/**
- * @Description 鏍规嵁id鏌ヨ璇︽儏
+ * @Description 鏍规嵁id鏌ヨ璇︽儏
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
@@ -122,6 +176,7 @@
/**
* 鎾ら攢
+ *
* @author 鍗㈠簡闃�
* @date 2023/10/31
*/
@@ -136,7 +191,7 @@
}
/**
- * @Description 璋冩嫧鍏ュ簱
+ * @Description 璋冩嫧鍏ュ簱
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
@@ -147,7 +202,7 @@
}
/**
- * @Description 璋冩嫧鍑哄簱
+ * @Description 璋冩嫧鍑哄簱
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
@@ -158,7 +213,7 @@
}
/**
- * @Description 瀵煎嚭璋冩嫧鍑哄簱鍗�
+ * @Description 瀵煎嚭璋冩嫧鍑哄簱鍗�
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
@@ -167,9 +222,129 @@
if (id == null) {
return ResponseValue.error("璋冩嫧鍗昳d涓虹┖");
}
- LWhFormOutputVo vo = this.lWhFormTransferService.export(id,this.getCurrentUser());
+ LWhFormOutputVo vo = this.lWhFormTransferService.export(id, this.getCurrentUser());
return ResponseValue.success(vo);
}
+ /**
+ * 閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏
+ *
+ * @param transferQryDto
+ * @return
+ */
+ @GetMapping("/department/list")
+ public ResponseValue departmentTransferList(TransferQryDto transferQryDto) {
+
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ GenericPager<Map<String, Object>> transferInfoDetailsVoGenericPager = this.lWhFormTransferService.queryTransferInfo(transferQryDto);
+ return ResponseValue.success(transferInfoDetailsVoGenericPager);
+ }
+
+ /**
+ * 閮ㄩ棬鐗╁搧浣跨敤璁板綍
+ *
+ * @param procureModelInfoDto
+ * @return
+ */
+ @PostMapping("/useInfo/update")
+ public ResponseValue infoUpdate(@RequestBody List<ProcureModelInfoDto> procureModelInfoDto) {
+
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ if (CollectionUtils.isEmpty(procureModelInfoDto)) {
+ return ResponseValue.error("鍙傛暟閿欒");
+ }
+
+ for (ProcureModelInfoDto procureModelInfo : procureModelInfoDto) {
+
+ String transferOrderId = procureModelInfo.getTransferOrderId();
+ String baseGoodModelId = procureModelInfo.getBaseGoodModelId();
+
+ LWhProcureModel lWhProcureModel = new LWhProcureModel();
+ lWhProcureModel.setBusinessId(Long.valueOf(transferOrderId));
+ lWhProcureModel.setBaseGoodsModelsId(Long.valueOf(baseGoodModelId));
+ // 閮ㄩ棬鍒嗗彂
+ lWhProcureModel.setBusinessType(4);
+ List<LWhProcureModel> lWhProcureModelList = lWhProcureModelService.select(lWhProcureModel);
+ lWhProcureModelList.forEach(item -> {
+ Long id = item.getId();
+ LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
+ lWhProcureModelUser.setWhProcureModelId(id);
+ List<LWhProcureModelUser> procureModelUserList = lWhProcureModelUserService.select(lWhProcureModelUser);
+ procureModelUserList.forEach(procureModelUser -> {
+ procureModelUser.setNowUserName(procureModelInfo.getUserName());
+ procureModelUser.setNowUserPhone(procureModelInfo.getPhone());
+
+ LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
+ lWhProcureModelUserRecord.setId(IdUtil.generateId());
+ lWhProcureModelUserRecord.setTransBusinessId(Long.valueOf(transferOrderId));
+ FinSysTenantUser sysInfo = getSysInfo();
+ lWhProcureModelUserRecord.setOperatorId(sysInfo.getId());
+ lWhProcureModelUserRecord.setOperatorName(sysInfo.getUserName());
+ lWhProcureModelUserRecord.setDealTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+ lWhProcureModelUserRecordService.insert(lWhProcureModelUserRecord);
+ });
+ lWhProcureModelUserService.updateBatch(procureModelUserList);
+ });
+ }
+ return ResponseValue.success();
+ }
+
+ /**
+ * 閮ㄩ棬鐗╁搧浣跨敤璁板綍
+ *
+ * @param transferOrderId
+ * @return
+ */
+ @GetMapping("/use/record")
+ public ResponseValue useRecord(Long transferOrderId) {
+
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
+ lWhProcureModelUserRecord.setTransBusinessId(transferOrderId);
+ List<LWhProcureModelUserRecord> modelUserRecords = lWhProcureModelUserRecordService.select(lWhProcureModelUserRecord);
+
+ List<UseRecordDto> result = Lists.newArrayList();
+ for (LWhProcureModelUserRecord item : modelUserRecords) {
+ Long id = item.getId();
+ UseRecordDto useRecordDto = new UseRecordDto();
+ useRecordDto.setId(id);
+ useRecordDto.setUpdateUserName(item.getOperatorName());
+ useRecordDto.setUpdateTime(DateUtils.toShowDate(item.getDealTime()));
+
+ LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
+ lWhProcureModelUser.setWhProcureModelId(id);
+ List<LWhProcureModelUser> procureModelUserList = lWhProcureModelUserService.select(lWhProcureModelUser);
+
+ List<UseRecordSkuDto> recordSkuDtoList = Lists.newArrayList();
+ procureModelUserList.forEach(procureModelUser -> {
+ UseRecordSkuDto useRecordSkuDto = new UseRecordSkuDto();
+
+ BaseGoodsModels baseGoodsModels = new BaseGoodsModels();
+ baseGoodsModels.setId(procureModelUser.getBaseGoodsModelsId());
+ BaseGoodsModels baseGoodsModel = baseGoodsModelsService.getByModelNameAndGoodsTemplatesId(baseGoodsModels);
+ String unit = baseGoodsModel.getUnit();
+ useRecordSkuDto.setBaseUnit(unit);
+ useRecordSkuDto.setBaseGoodModelName(baseGoodsModel.getModelName());
+ useRecordSkuDto.setCount(procureModelUser.getGoodsNum());
+ useRecordSkuDto.setPhone(procureModelUser.getNowUserPhone());
+ useRecordSkuDto.setUserName(procureModelUser.getNowUserName());
+
+ recordSkuDtoList.add(useRecordSkuDto);
+ });
+ useRecordDto.setRecordSkuDtoList(recordSkuDtoList);
+
+ }
+ return ResponseValue.success(result);
+ }
+
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureParam.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureParam.java
index e674595..06c1918 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureParam.java
@@ -1,17 +1,19 @@
package com.consum.base.pojo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.walker.web.param.ParamRequest;
-
import java.util.List;
+import lombok.Data;
/**
* @ClassName LWhFormProcureParam
-
* @Date 2023/10/27
* @Description
* @Version 1.0
**/
+@Data
public class LWhFormProcureParam extends ParamRequest {
+
private Long id;
/**
* 浠撳簱缂栧彿
@@ -28,6 +30,11 @@
*/
private Integer buyType = null;
+ /**
+ * 閲囪喘鏂瑰紡鏃堕棿yyyy-MM-dd HH:mm:ss
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String procureTime;
/**
* 閲囪喘鍗曞瀷鍙�
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormTransferParam.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormTransferParam.java
index e93c9a8..d5d9c6c 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhFormTransferParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormTransferParam.java
@@ -1,20 +1,26 @@
package com.consum.base.pojo;
import com.walker.web.param.ParamRequest;
-
import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* @Description
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class LWhFormTransferParam extends ParamRequest {
+
private Long id;
/**
* 鍏ュ簱浠撳簱缂栧彿
*/
- private Long inWarehouseId;
+ private Long inWarehouseId;
/**
* 鍑哄簱浠撳簱鏈烘瀯缂栧彿锛堣皟鎷ㄦ満鏋勶級
*/
@@ -72,6 +78,17 @@
*/
private Long inTimeEnd;
+ /**
+ * 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
+ */
+ private Integer transferBusinessType;
+
+ /**
+ * 閮ㄩ棬鐗╁搧浣跨敤浜�
+ * TODO 灞炴�ч噸澶�
+ */
+ private List<LWhProcureModelUserDTO> procureModelUserList;
+
public Long getInWarehouseId() {
return inWarehouseId;
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhProcureModelParams.java b/consum-base/src/main/java/com/consum/base/pojo/LWhProcureModelParams.java
index 3c666c5..3c3ecc1 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhProcureModelParams.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhProcureModelParams.java
@@ -1,21 +1,26 @@
package com.consum.base.pojo;
import com.walker.web.param.ParamRequest;
+import java.util.List;
/**
* @ClassName LWhProcureModelParams
-
* @Date 2023/10/27
* @Description
* @Version 1.0
**/
public class LWhProcureModelParams extends ParamRequest {
+
// //瑙勬牸鍨嬪彿缂栧彿
private Long baseGoodsModelsId = null;
//浠锋牸
private Long price = null;
//鏁伴噺
private Integer counts = null;
+
+ private Integer procureModelBusinessType;
+
+ private List<LWhProcureModelUserDTO> lWhProcureModelUserList;
public Long getPrice() {
return price;
@@ -40,4 +45,20 @@
public void setBaseGoodsModelsId(Long baseGoodsModelsId) {
this.baseGoodsModelsId = baseGoodsModelsId;
}
+
+ public List<LWhProcureModelUserDTO> getlWhProcureModelUserList() {
+ return lWhProcureModelUserList;
+ }
+
+ public void setlWhProcureModelUserList(List<LWhProcureModelUserDTO> lWhProcureModelUserList) {
+ this.lWhProcureModelUserList = lWhProcureModelUserList;
+ }
+
+ public Integer getProcureModelBusinessType() {
+ return procureModelBusinessType;
+ }
+
+ public void setProcureModelBusinessType(Integer procureModelBusinessType) {
+ this.procureModelBusinessType = procureModelBusinessType;
+ }
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhProcureModelUserDTO.java b/consum-base/src/main/java/com/consum/base/pojo/LWhProcureModelUserDTO.java
new file mode 100644
index 0000000..735c178
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhProcureModelUserDTO.java
@@ -0,0 +1,45 @@
+package com.consum.base.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: TODO
+ * @date 2023/11/6 9:28
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LWhProcureModelUserDTO {
+
+ /**
+ * 璋冩嫧涓氬姟ID
+ */
+ private Long transBusinessId;
+
+ /**
+ * 瑙勬牸鍨嬪彿缂栧彿
+ */
+ private Long baseGoodsModelsId;
+ /**
+ * 璋冩嫧鐗╁搧鍨嬪彿琛↖D
+ */
+ private Long whProcureModelId;
+ /**
+ * 褰撳墠浣跨敤浜哄憳鐢佃瘽
+ */
+ private Long nowUserPhone;
+ /**
+ * 褰撳墠浣跨敤浜哄憳鍚嶇О
+ */
+ private String nowUserName;
+ /**
+ * 鐗╁搧鍒嗗彂鏁伴噺
+ */
+ private Integer goodsNum;
+
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/ProcureModelInfoDto.java b/consum-base/src/main/java/com/consum/base/pojo/ProcureModelInfoDto.java
new file mode 100644
index 0000000..de7b9b6
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/ProcureModelInfoDto.java
@@ -0,0 +1,32 @@
+package com.consum.base.pojo;
+
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: TODO
+ * @date 2023/11/8 11:48
+ */
+@Data
+public class ProcureModelInfoDto {
+
+ // 鍗曞彿id
+ private String transferOrderId;
+ // 鐗╁搧瑙勬牸鍨嬪彿
+ private String baseGoodModelId;
+
+ // 璁￠噺鍗曚綅
+ private String baseUnit;
+
+ // 浣跨敤浜�
+ private String userName;
+
+ // 鑱旂郴鐢佃瘽
+ private Long phone;
+
+ // 鏁伴噺
+ private int count;
+
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/RecordUserInfoDto.java b/consum-base/src/main/java/com/consum/base/pojo/RecordUserInfoDto.java
new file mode 100644
index 0000000..486566b
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/RecordUserInfoDto.java
@@ -0,0 +1,24 @@
+package com.consum.base.pojo;
+
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: TODO
+ * @date 2023/11/8 15:20
+ */
+@Data
+public class RecordUserInfoDto {
+
+
+ // 浣跨敤浜�
+ private String userName;
+
+ // 鑱旂郴鐢佃瘽
+ private Long phone;
+
+ // 鏁伴噺
+ private int count;
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/UseRecordDto.java b/consum-base/src/main/java/com/consum/base/pojo/UseRecordDto.java
new file mode 100644
index 0000000..ba4733d
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/UseRecordDto.java
@@ -0,0 +1,25 @@
+package com.consum.base.pojo;
+
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: TODO
+ * @date 2023/11/8 15:20
+ */
+@Data
+public class UseRecordDto {
+
+ // recordId
+ private Long id;
+ // 淇敼浜�
+ private String updateUserName;
+ // 淇敼鏃堕棿
+ private String updateTime;
+ // 瑙勬牸鍨嬪彿
+ private List<UseRecordSkuDto> recordSkuDtoList;
+
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/UseRecordSkuDto.java b/consum-base/src/main/java/com/consum/base/pojo/UseRecordSkuDto.java
new file mode 100644
index 0000000..e67a501
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/UseRecordSkuDto.java
@@ -0,0 +1,37 @@
+package com.consum.base.pojo;
+
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: TODO
+ * @date 2023/11/8 15:20
+ */
+@Data
+public class UseRecordSkuDto {
+
+
+ // 鍗曞彿id
+ private String transferOrderId;
+ // 鐗╁搧瑙勬牸鍨嬪彿
+ private String baseGoodModelId;
+ // 鐗╁搧瑙勬牸鍨嬪彿
+ private String baseGoodModelName;
+ // 璁￠噺鍗曚綅
+ private String baseUnit;
+
+ // 浣跨敤浜�
+ private String userName;
+
+ // 鑱旂郴鐢佃瘽
+ private Long phone;
+
+ // 鏁伴噺
+ private int count;
+
+ private List<RecordUserInfoDto> recordUserInfos;
+
+
+}
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/TransferQryDto.java
new file mode 100644
index 0000000..4f782dc
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/query/TransferQryDto.java
@@ -0,0 +1,97 @@
+package com.consum.base.pojo.query;
+
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: TODO
+ * @date 2023/11/6 11:47
+ */
+@Data
+public class TransferQryDto {
+
+
+ /**
+ * 璋冩嫧鍗曞彿/鍒嗗彂鍗曞彿
+ */
+ private String businessFormCode;
+ /**
+ * 鐗╁搧妯＄増鍚嶇О
+ */
+ private String goodsTemplateName;
+ /**
+ * 鍑哄簱浠撳簱鏈烘瀯缂栧彿锛堣皟鎷ㄦ満鏋勶級
+ */
+ private Long outAgencyId;
+ /**
+ * 鎺ユ敹鏈烘瀯
+ */
+ private Long inAgencyId;
+ /**
+ * 鐘舵�� 0=寰呭嚭搴擄紱1=寰呮帴鏀讹紱2=宸插叆搴�
+ */
+ private Short states;
+ /**
+ * 鍒涘缓浜�/鍒嗗彂浜�
+ */
+ private String operatorName;
+ /**
+ * 鐢宠鏃堕棿 寮�濮�
+ */
+ private Long createTimeStart;
+ /**
+ * 鐢宠鏃堕棿 缁撴潫
+ */
+ private Long createTimeEnd;
+ /**
+ * 鎺ユ敹鏃堕棿 寮�濮�
+ */
+ private Long inTimeStart;
+ /**
+ * 鎺ユ敹鏃堕棿 缁撴潫
+ */
+ private Long inTimeEnd;
+
+ /**
+ * 瑙勬牸鍨嬪彿id
+ */
+ private Long baseGoodsTemplateId;
+
+ /**
+ * 椤电爜
+ */
+ private Integer pageNum;
+ /**
+ * 椤靛ぇ灏�
+ */
+ private Integer pageSize;
+
+// /**
+// * 鍏ュ簱浠撳簱缂栧彿
+// */
+// private Long inWarehouseId;
+//
+// /**
+// * 璋冩嫧鏃堕棿
+// */
+// private Long createTime;
+// /**
+// * 璋冩嫧鎵嬬画
+// */
+// private String procureDoc;
+// /**
+// * 璋冩嫧鍗曞瀷鍙�
+// */
+// private List<LWhProcureModelParams> models;
+// /**
+// * 鐗╁搧id
+// */
+// private Long baseGoodsTemplateId;
+// /**
+// * 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
+// */
+// private Integer transferBusinessType;
+
+
+}
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 4558e52..cc0c2cf 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
@@ -2,18 +2,14 @@
import com.consum.base.Constants;
import com.consum.base.util.IdUtil;
-import com.consum.model.po.BaseCategory;
import com.consum.model.po.BaseGoodsModels;
-import com.consum.model.po.BaseGoodsTemplate;
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.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
import java.util.HashMap;
import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
/**
* @Description 鐗╁搧妯℃澘
@@ -41,7 +37,7 @@
}
/**
- * @Description 鏍规嵁 鍨嬪彿鍚嶇О鍜岀墿鍝佹ā鏉縤d 鏌ヨ瑙勬牸鍨嬪彿
+ * @Description 鏍规嵁 鍨嬪彿鍚嶇О鍜岀墿鍝佹ā鏉縤d 鏌ヨ瑙勬牸鍨嬪彿
* @Author 鍗㈠簡闃�
* @Date 2023/10/25
*/
@@ -72,6 +68,7 @@
/**
* 淇敼鐘舵��
+ *
* @author 鍗㈠簡闃�
* @date 2023/10/25
*/
@@ -90,10 +87,10 @@
}
/**
- * @Description 鏍规嵁瑙勬牸鍨嬪彿id鏌ヨ瑙勬牸鍨嬪彿
+ * @param idList
+ * @Description 鏍规嵁瑙勬牸鍨嬪彿id鏌ヨ瑙勬牸鍨嬪彿
* @Author 鍗㈠簡闃�
* @Date 2023/11/2
- * @param idList
*/
public List<BaseGoodsModels> selectByModelsIdList(List<Long> idList) {
if (CollectionUtils.isEmpty(idList)) {
@@ -116,7 +113,7 @@
}
/**
- * @Description 鏍规嵁鐗╁搧id鏌ヨ瑙勬牸鍨嬪彿
+ * @Description 鏍规嵁鐗╁搧id鏌ヨ瑙勬牸鍨嬪彿
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
@@ -125,4 +122,6 @@
baseGoodsModels.setGoodsTemplatesId(goodsTemplatesId);
return this.select(baseGoodsModels);
}
+
+
}
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
index cddee81..4db2cf8 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
@@ -14,14 +14,13 @@
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* @Description 鐗╁搧妯℃澘
@@ -251,6 +250,7 @@
/**
* 淇敼鐘舵��
+ *
* @author 鍗㈠簡闃�
* @date 2023/10/25
*/
@@ -274,10 +274,10 @@
}
/**
- * @Description 鏌ヨ浠撳簱绫诲瀷(鏁版嵁瀛楀吀)
+ * @return
+ * @Description 鏌ヨ浠撳簱绫诲瀷(鏁版嵁瀛楀吀)
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
- * @return
*/
public List<S_dict_data> queryClassificationCode() {
StringBuilder sql = new StringBuilder("SELECT * FROM s_dict_data WHERE dict_type = 'CLASSIFICATION_CODE' order by dict_sort");
@@ -285,7 +285,7 @@
}
/**
- * @Description 鏍规嵁鍒嗙被id鏌ヨ鐗╁搧妯℃澘
+ * @Description 鏍规嵁鍒嗙被id鏌ヨ鐗╁搧妯℃澘
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
@@ -294,4 +294,14 @@
goodsTemplate.setCategoryId(categoryId);
return this.select(goodsTemplate);
}
+
+ public List<BaseGoodsTemplate> queryByAgencyId(Long agencyId) {
+ StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1=1 ");
+ Map<String, Object> params = new HashMap<>();
+ if (agencyId != null) {
+ sql.append(" AND model.id=:modelId");
+ params.put("agencyId", agencyId);
+ }
+ return this.select(sql.toString(), params, new BaseGoodsTemplate());
+ }
}
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 da88dcb..810a5bf 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,28 +2,40 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
-import com.consum.base.core.WhBusinessEnum;
+import com.consum.base.core.tools.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.util.IdUtil;
-import com.consum.model.po.*;
+import com.consum.model.po.BaseGoodsModels;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenant;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormOutput;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.LWhGoodsRecord;
+import com.consum.model.po.LWhProcureModel;
+import com.consum.model.po.LWhProcureModelUser;
import com.consum.model.vo.LWhFormOutputVo;
import com.consum.model.vo.LWhFormTransferVo;
import com.consum.model.vo.LWhGoodsRecordVo;
+import com.consum.model.vo.LWhProcureModelVo;
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 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.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;
/**
* @Description 璋冩嫧绠＄悊
@@ -51,8 +63,11 @@
private LWhGoodsRecordService lWhGoodsRecordService;
@Autowired
private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+ @Autowired
+ private LWhProcureModelUserServiceImpl lWhProcureModelUserService;
private static String QUERY_FORM_TRANSFER_LIST = "SELECT * FROM l_wh_form_transfer WHERE 1 = 1";
+
/**
* @Description 鏂板
@@ -65,7 +80,12 @@
//璋冩嫧鍗昳d
long lWhFormTransferId = IdUtil.generateId();
lWhFormTransfer.setId(lWhFormTransferId);
- lWhFormTransfer.setBusinessType(0);
+
+ Integer businessType = param.getTransferBusinessType();
+ // 涓氬姟绫诲瀷 璋冩嫧/閮ㄩ棬鍒嗗彂/閮ㄩ棬閫�鍥� 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
+ // TODO 鏋氫妇瀛楀吀
+ lWhFormTransfer.setBusinessType(businessType);
+
lWhFormTransfer.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Transfer));
Long warehouseId = param.getInWarehouseId();
lWhFormTransfer.setInWarehouseId(warehouseId);
@@ -89,43 +109,80 @@
lWhFormTransfer.setOperatorId(sysInfo.getId());
lWhFormTransfer.setOperatorName(sysInfo.getUserName());
lWhFormTransfer.setCreateTime(param.getCreateTime());
+ //0=寰呭嚭搴擄紱1=寰呮帴鏀讹紱2=宸插叆搴撳簱:4=宸叉挙閿�
lWhFormTransfer.setStates(0);
lWhFormTransfer.setProcureDoc(param.getProcureDoc());
+
+ //3.褰撲笟鍔＄被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉
+ if (businessType == 1) {
+ //閮ㄩ棬鍒嗗彂绫诲瀷 鍑哄簱浠撳簱绫诲瀷0鏈烘瀯1閮ㄩ棬
+ // TODO 鍑哄簱涓氬姟绫诲瀷 鑱旂郴鐢佃瘽
+ lWhFormTransfer.setOutWarehouseType(1);
+ }
int flag1 = this.insert(lWhFormTransfer);
if (flag1 == 0) {
log.error("鏂板璋冩嫧鍗曞け璐�");
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(2);
+ // 鐗╁搧鍨嬪彿涓氬姟绫诲瀷
+ lWhProcureModel.setBusinessType(model.getProcureModelBusinessType());
lWhProcureModel.setBusinessId(lWhFormTransferId);
lWhProcureModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId());
lWhProcureModel.setCounts(model.getCounts());
//鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0,warehouseId, model.getBaseGoodsModelsId(), (short) 1, null);
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, model.getBaseGoodsModelsId(), (short) 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
+
+ //3.褰撲笟鍔＄被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉
+ // 鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂
+ if (model.getProcureModelBusinessType() == 4) {
+ List<LWhProcureModelUser> procureModelUserList = Lists.newArrayList();
+ for (LWhProcureModelUserDTO lWhProcureModelUserDTO : model.getlWhProcureModelUserList()) {
+ LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
+ lWhProcureModelUser.setId(IdUtil.generateId());
+ lWhProcureModelUser.setTransBusinessId(lWhFormTransferId);
+ lWhProcureModelUser.setWhProcureModelId(lWhProcureModel.getId());
+ lWhProcureModelUser.setBaseGoodsModelsId(model.getBaseGoodsModelsId());
+ lWhProcureModelUser.setNowUserName(lWhProcureModelUserDTO.getNowUserName());
+ lWhProcureModelUser.setNowUserPhone(lWhProcureModelUserDTO.getNowUserPhone());
+ lWhProcureModelUser.setGoodsNum(lWhProcureModelUserDTO.getGoodsNum());
+ procureModelUserList.add(lWhProcureModelUser);
+ }
+ int procureInsertNum = lWhProcureModelUserService.insert(procureModelUserList);
+ if (procureInsertNum != procureModelUserList.size()) {
+ log.error("鏂板鐗╁搧浣跨敤淇℃伅澶辫触");
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return 0;
+ }
+ }
+
modelList.add(lWhProcureModel);
}
+
int flag2 = this.lWhProcureModelService.insert(modelList);
if (flag2 != modelList.size()) {
log.error("鏂板鐗╁搧鍨嬪彿澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return 0;
}
+
return 1;
}
+
/**
- * @Description 鍒楄〃鏌ヨ
+ * @Description 鍒楄〃鏌ヨ
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
- public GenericPager<LWhFormTransfer> queryFormTransferList(LWhFormTransferParam param) {
+ public GenericPager<LWhFormTransfer> queryFormTransferList(TransferQryDto param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(QUERY_FORM_TRANSFER_LIST);
//璋冩嫧鍗曞彿
@@ -135,18 +192,19 @@
}
//鐗╁搧鍚嶇О
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)");
+ 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);
}
//璋冩嫧鏈烘瀯
- if (param.getOutAgencyId() != null){
+ if (param.getOutAgencyId() != null) {
sql.append(" and OUT_AGENCY_ID = :OUT_AGENCY_ID ");
paramts.put("OUT_AGENCY_ID", param.getOutAgencyId());
}
//鎺ユ敹鏈烘瀯
- if (param.getInAgencyId() != null){
+ if (param.getInAgencyId() != null) {
sql.append(" and IN_AGENCY_ID = :IN_AGENCY_ID ");
- paramts.put("IN_AGENCY_ID", param.getInAgencyId() );
+ paramts.put("IN_AGENCY_ID", param.getInAgencyId());
}
//鐘舵��
if (param.getStates() != null) {
@@ -184,7 +242,7 @@
}
/**
- * @Description 鏍规嵁id鏌ヨ璇︽儏
+ * @Description 鏍规嵁id鏌ヨ璇︽儏
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
@@ -193,18 +251,32 @@
//1.鏌ヨ璋冩嫧鍗�
LWhFormTransfer lWhFormTransfer = this.get(new LWhFormTransfer(id));
if (lWhFormTransfer != null) {
- BeanUtils.copyProperties(lWhFormTransfer,vo);
+ BeanUtils.copyProperties(lWhFormTransfer, vo);
}
//2.鏌ヨ鐗╁搧鍨嬪彿
- List<LWhProcureModel> models = this.lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, id);
+// List<LWhProcureModel> models = this.lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, id);
+ List<LWhProcureModel> models = this.lWhProcureModelService.getModelByForm(null, id);
+
if (!CollectionUtils.isEmpty(models)) {
- vo.setModels(models);
+ List<LWhProcureModelVo> lWhProcureModelVoList = Lists.newArrayList();
+ for (LWhProcureModel model : models) {
+ LWhProcureModelVo lWhProcureModelVo = new LWhProcureModelVo();
+ BeanUtils.copyProperties(model, lWhProcureModelVo);
+
+ LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
+ lWhProcureModelUser.setWhProcureModelId(model.getId());
+ List<LWhProcureModelUser> select = lWhProcureModelUserService.select(lWhProcureModelUser);
+ lWhProcureModelVo.setProcureModelUsersList(select);
+ lWhProcureModelVoList.add(lWhProcureModelVo);
+ }
+ vo.setModels(lWhProcureModelVoList);
}
return vo;
}
+
/**
- * @Description 瀵煎嚭璋冩嫧鍑哄簱鍗�
+ * @Description 瀵煎嚭璋冩嫧鍑哄簱鍗�
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
@@ -215,8 +287,8 @@
Long outWarehouseFormId = this.lWhFormOutputCoreService.createOutFormByTransId(id, currentUser, dealTime);
//2.鍑哄簱鍗昳d鏌ヨ鍑哄簱鍗�
LWhFormOutput lWhFormOutput = this.lWhFormOutputService.get(new LWhFormOutput(outWarehouseFormId));
- if (lWhFormOutput!= null) {
- BeanUtils.copyProperties(lWhFormOutput,result);
+ if (lWhFormOutput != null) {
+ BeanUtils.copyProperties(lWhFormOutput, result);
}
//3.鏍规嵁杩涘嚭搴撴祦姘存�昏〃id鏌ヨl_wh_goods_record
LWhGoodsRecord record = new LWhGoodsRecord();
@@ -226,7 +298,7 @@
if (!CollectionUtils.isEmpty(recordList)) {
for (LWhGoodsRecord lWhGoodsRecord : recordList) {
LWhGoodsRecordVo vo = new LWhGoodsRecordVo();
- BeanUtils.copyProperties(lWhGoodsRecord,vo);
+ BeanUtils.copyProperties(lWhGoodsRecord, vo);
//鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿
BaseGoodsModels baseGoodsModels = baseGoodsModelsService.get(new BaseGoodsModels(id));
if (baseGoodsModels != null) {
@@ -242,6 +314,7 @@
/**
* 鎾ら攢
+ *
* @author 鍗㈠簡闃�
* @date 2023/10/31
*/
@@ -250,4 +323,72 @@
lWhFormTransfer.setStates(4);
return this.update(lWhFormTransfer);
}
+
+ public GenericPager<Map<String, Object>> queryTransferInfo(TransferQryDto transferQryDto) {
+
+ HashMap<String, Object> paramts = new HashMap<>();
+ StringBuilder sql = new StringBuilder("SELECT\n"
+ + "\tft.id,\n"
+ + "\tft.BUSINESS_FORM_CODE businessCode,\n"
+ + "\tbgt.GOODS_NAME goodsName,\n"
+ + "\tbgt.CLASSIFICATION goodsType,\n"
+ + "\tbgm.id goodsModelId,\n"
+ + "\tbgm.MODEL_NAME goodsModelName,\n"
+ + "\tpm.COUNTS goodsCount,\n"
+ + "\tfst.`name` tennatName,\n"
+ + "\tfstd.NAME departmentName,\n"
+ + "\tft.OPERATOR_ID distributor,\n"
+ + "\tft.CREATE_TIME TIME \n"
+ + "FROM\n"
+ + "\tl_wh_form_transfer ft\n"
+ + "\tLEFT JOIN l_wh_procure_model pm ON ft.ID = pm.BUSINESS_ID\n"
+ + "\tLEFT JOIN base_goods_models bgm ON bgm.GOODS_TEMPLATES_ID = pm.BASE_GOODS_MODELS_ID\n"
+ + "\tLEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID\n"
+ + "\tLEFT JOIN fin_sys_tenant_user fstu ON fstu.id = ft.OPERATOR_ID\n"
+ + "\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())) {
+ sql.append("AND BUSINESS_FORM_CODE like :businessFormCode ");
+ paramts.put("businessFormCode", StringUtils.CHAR_PERCENT + transferQryDto.getBusinessFormCode() + StringUtils.CHAR_PERCENT);
+ }
+ //鐗╁搧鍚嶇О
+ if (StringUtils.isNotEmpty(transferQryDto.getGoodsTemplateName())) {
+ sql.append("AND bgt.GOODS_NAME like:goodsName ");
+ paramts.put("goodsName", StringUtils.CHAR_PERCENT + transferQryDto.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ }
+ // 瑙勬牸鍨嬪彿
+ if (transferQryDto.getBaseGoodsTemplateId() != null) {
+ sql.append("AND bgm.id =:goodsModelId ");
+ paramts.put("goodsModelId", transferQryDto.getBaseGoodsTemplateId());
+ }
+ //璋冩嫧鏈烘瀯
+ if (transferQryDto.getOutAgencyId() != null) {
+ sql.append("AND OUT_AGENCY_ID = :OUT_AGENCY_ID ");
+ paramts.put("OUT_AGENCY_ID", transferQryDto.getOutAgencyId());
+ }
+
+ //鍒涘缓浜�
+ if (StringUtils.isNotEmpty(transferQryDto.getOperatorName())) {
+ sql.append("AND ft.OPERATOR_NAME =:OPERATOR_NAME ");
+ paramts.put("OPERATOR_NAME", transferQryDto.getOperatorName());
+ }
+ //鐢宠鏃堕棿
+ if (transferQryDto.getCreateTimeStart() != null) {
+ sql.append("AND ft.CREATE_TIME >=:createTimeStart ");
+ paramts.put("createTimeStart", transferQryDto.getCreateTimeStart() * 1000000);
+ }
+ if (transferQryDto.getCreateTimeEnd() != null) {
+ sql.append("AND ft.CREATE_TIME <:createTimeEnd ");
+ paramts.put("createTimeEnd", transferQryDto.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(),
+ new MapRowMapper());
+
+ return mapGenericPager;
+ }
+
+
}
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 1c475e8..83e813c 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
@@ -33,7 +33,7 @@
sql.append(" and BUSINESS_TYPE=:businessType ");
paramts.put("businessType", businessType.getValue());
}
- if (businessType != null) {
+ if (businessId != null) {
sql.append(" and BUSINESS_ID=:businessId ");
paramts.put("businessId", businessId);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserRecordServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserRecordServiceImpl.java
index 55baf6c..f7009f2 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserRecordServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserRecordServiceImpl.java
@@ -5,7 +5,6 @@
/**
* @ClassName LWhProcureModelUserRecordServiceImpl
-
* @Date 2023/11/2
* @Description
* @Version 1.0
@@ -13,4 +12,5 @@
@Service
public class LWhProcureModelUserRecordServiceImpl extends BaseServiceImpl {
+
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserServiceImpl.java
index db79911..d63a8c1 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserServiceImpl.java
@@ -4,12 +4,11 @@
import org.springframework.stereotype.Service;
/**
- * @ClassName LWhProcureModelUserServiceImpl
- * @Author cy
- * @Date 2023/11/3
- * @Description
- * @Version 1.0
- **/
+ * @author asus
+ * @version 1.0
+ * @description: TODO
+ * @date 2023/11/2 16:21
+ */
@Service
public class LWhProcureModelUserServiceImpl extends BaseServiceImpl {
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/WhFormTransfer_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/WhFormTransfer_mapper.java
index 3146b6f..2d15552 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/WhFormTransfer_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/WhFormTransfer_mapper.java
@@ -7,19 +7,18 @@
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;
/**
* 琛ㄥ悕:WH_FORM_TRANSFER *
+ *
* @author genrator
*/
public class WhFormTransfer_mapper extends WhFormTransfer implements BaseMapper<WhFormTransfer> {
+
// 搴忓垪鍖栫増鏈彿
private static final long serialVersionUID = 1L;
@@ -144,12 +143,12 @@
public String getTableName_() {
String tableName = "wh_form_transfer";
/**
- 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;
}
@@ -343,7 +342,9 @@
*/
@Override
public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
- return new SqlAndParameters<>("select id, business_form_code, in_warehouse_id, in_warehouse_name, out_warehouse_id, out_warehouse_name, in_agency_id, in_agency_name, out_agency_id, out_agency_name, operator_id, operator_name, create_time, states, operator_id3, operator_name3, ininput_time, operator_id2, operator_name2, output_time, beiz1, beiz2, beiz3, procure_doc from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>(
+ "select id, business_form_code, in_warehouse_id, in_warehouse_name, out_warehouse_id, out_warehouse_name, in_agency_id, in_agency_name, out_agency_id, out_agency_name, operator_id, operator_name, create_time, states, operator_id3, operator_name3, ininput_time, operator_id2, operator_name2, output_time, beiz1, beiz2, beiz3, procure_doc from "
+ + this.getTableName_() + " " + where, parameters);
}
/**
@@ -351,7 +352,9 @@
*/
@Override
public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
- return new SqlAndParameters<>("select id, business_form_code, in_warehouse_id, in_warehouse_name, out_warehouse_id, out_warehouse_name, in_agency_id, in_agency_name, out_agency_id, out_agency_name, operator_id, operator_name, create_time, states, operator_id3, operator_name3, ininput_time, operator_id2, operator_name2, output_time, beiz1, beiz2, beiz3, procure_doc from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>(
+ "select id, business_form_code, in_warehouse_id, in_warehouse_name, out_warehouse_id, out_warehouse_name, in_agency_id, in_agency_name, out_agency_id, out_agency_name, operator_id, operator_name, create_time, states, operator_id3, operator_name3, ininput_time, operator_id2, operator_name2, output_time, beiz1, beiz2, beiz3, procure_doc from "
+ + this.getTableName_() + " " + where, parameters);
}
/**
@@ -526,4 +529,61 @@
}
return wh_form_transfer;
}
+
+
}
+
+//class TransferInfoDetailsVoRowmapper implements RowMapper<TransferInfoDetailsVo> {
+//
+// @Override
+// public TransferInfoDetailsVo mapRow(ResultSet rs, int rowNum) throws SQLException {
+// ResultSetUtils resultSetUtils = new ResultSetUtils();
+// TransferInfoDetailsVo transferInfoDetailsVo = new TransferInfoDetailsVo();
+// int columnIndex;
+// columnIndex = resultSetUtils.findColumn(rs, "id");
+// if (columnIndex > 0) {
+// transferInfoDetailsVo.setId(rs.getLong(columnIndex));
+// }
+// columnIndex = resultSetUtils.findColumn(rs, "businessCode");
+// if (columnIndex > 0) {
+// transferInfoDetailsVo.setBusinessCode(rs.getString(columnIndex));
+// }
+// columnIndex = resultSetUtils.findColumn(rs, "goodsCount");
+// if (columnIndex > 0) {
+// transferInfoDetailsVo.setGoodsCount(rs.getInt(columnIndex));
+// }
+// columnIndex = resultSetUtils.findColumn(rs, "goodsName");
+// if (columnIndex > 0) {
+// transferInfoDetailsVo.setGoodsName(rs.getString(columnIndex));
+// }
+// columnIndex = resultSetUtils.findColumn(rs, "goodsType");
+// if (columnIndex > 0) {
+// transferInfoDetailsVo.setGoodsType(rs.getString(columnIndex));
+// }
+// columnIndex = resultSetUtils.findColumn(rs, "goodsModelName");
+// if (columnIndex > 0) {
+// transferInfoDetailsVo.setGoodsModelName(rs.getString(columnIndex));
+// }
+// columnIndex = resultSetUtils.findColumn(rs, "distributor");
+// if (columnIndex > 0) {
+// transferInfoDetailsVo.setDistributor(rs.getString(columnIndex));
+// }
+// columnIndex = resultSetUtils.findColumn(rs, "goodsModelId");
+// if (columnIndex > 0) {
+// transferInfoDetailsVo.setGoodsModelId(rs.getString(columnIndex));
+// }
+// columnIndex = resultSetUtils.findColumn(rs, "orgName");
+// if (columnIndex > 0) {
+// transferInfoDetailsVo.setOrgName(rs.getString(columnIndex));
+// }
+// columnIndex = resultSetUtils.findColumn(rs, "deptName");
+// if (columnIndex > 0) {
+// transferInfoDetailsVo.setDeptName(rs.getString(columnIndex));
+// }
+// columnIndex = resultSetUtils.findColumn(rs, "time");
+// if (columnIndex > 0) {
+// transferInfoDetailsVo.setTime(rs.getString(columnIndex));
+// }
+// return transferInfoDetailsVo;
+// }
+//}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/vo/LWhFormTransferVo.java b/consum-model-pojo/src/main/java/com/consum/model/vo/LWhFormTransferVo.java
index da7b8b3..f6ed2b5 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/vo/LWhFormTransferVo.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/vo/LWhFormTransferVo.java
@@ -1,22 +1,20 @@
-
package com.consum.model.vo;
import com.consum.model.po.LWhFormTransfer;
-import com.consum.model.po.LWhProcureModel;
-
import java.util.List;
public class LWhFormTransferVo extends LWhFormTransfer {
+
/**
* 瑙勬牸鍨嬪彿
*/
- private List<LWhProcureModel> models;
+ private List<LWhProcureModelVo> models;
- public List<LWhProcureModel> getModels() {
+ public List<LWhProcureModelVo> getModels() {
return models;
}
- public void setModels(List<LWhProcureModel> models) {
+ public void setModels(List<LWhProcureModelVo> models) {
this.models = models;
}
}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/vo/LWhProcureModelVo.java b/consum-model-pojo/src/main/java/com/consum/model/vo/LWhProcureModelVo.java
new file mode 100644
index 0000000..7b20425
--- /dev/null
+++ b/consum-model-pojo/src/main/java/com/consum/model/vo/LWhProcureModelVo.java
@@ -0,0 +1,54 @@
+package com.consum.model.vo;
+
+import com.consum.model.po.LWhProcureModelUser;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: TODO
+ * @date 2023/11/6 15:23
+ */
+@Data
+public class LWhProcureModelVo {
+
+
+ // 涓婚敭
+ private Long id;
+
+ // 灞炴�у垪琛�
+ private Long fromProcureGoodsId;
+
+
+ private Integer businessType;
+
+
+ private Long businessId;
+
+
+ private Long baseGoodsModelsId;
+
+
+ private String baseGoodsModelsName;
+
+
+ private Long price;
+
+
+ private Integer counts;
+
+
+ private Integer worehouseCount;
+
+
+ private String supplier;
+
+ /**
+ * 鐗╁搧浣跨敤浜轰俊鎭�
+ * TODO 灞炴�ч噸澶�
+ */
+ private List<LWhProcureModelUser> procureModelUsersList;
+
+
+}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/vo/TransferInfoDetailsVo.java b/consum-model-pojo/src/main/java/com/consum/model/vo/TransferInfoDetailsVo.java
new file mode 100644
index 0000000..cc21f19
--- /dev/null
+++ b/consum-model-pojo/src/main/java/com/consum/model/vo/TransferInfoDetailsVo.java
@@ -0,0 +1,42 @@
+package com.consum.model.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: 鍒嗗彂鏄庣粏
+ * @date 2023/11/7 11:48
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class TransferInfoDetailsVo {
+
+ //id
+ private Long id;
+ //鍗曞彿
+ private String businessCode;
+ //鐗╁搧鍚嶇О
+ private String goodsName;
+ //绫诲埆
+ private String goodsType;
+ //瑙勬牸鍨嬪彿id
+ private String goodsModelId;
+ //瑙勬牸鍨嬪彿鍚嶅瓧
+ private String goodsModelName;
+ //鍒嗗彂鏁伴噺
+ private Integer goodsCount;
+ //鎵�灞炴満鏋�
+ private String orgName;
+ //閮ㄩ棬
+ private String deptName;
+ //鍒嗗彂浜�
+ private String distributor;
+ //鍒嗗彂鏃堕棿
+ private String time;
+
+
+}
--
Gitblit v1.9.1