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/controller/LWhFormTransferController.java | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 203 insertions(+), 28 deletions(-)
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);
+ }
+
}
--
Gitblit v1.9.1