From 1742240f8f6841e2d930e549caabab94f2a58ece Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 22 十一月 2023 18:37:10 +0800
Subject: [PATCH] --报废单
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 138 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 104 insertions(+), 34 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 32b784a..a6acc2f 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,12 +1,18 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
+import com.consum.base.core.utils.IdUtil;
+import com.consum.base.core.utils.MapUtils;
+import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.pojo.LWhFormTransferGoodsInfoParam;
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.pojo.query.TransferQry;
+import com.consum.base.pojo.response.FormTransferVO;
+import com.consum.base.pojo.response.FromTransferTemplateInfoVO;
+import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.pojo.response.TransferInfoVO;
import com.consum.base.service.BaseGoodsModelsServiceImpl;
import com.consum.base.service.BaseWarehouseServiceImpl;
@@ -15,16 +21,14 @@
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.BaseWarehouse;
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;
@@ -36,6 +40,7 @@
import io.swagger.annotations.ApiOperation;
import java.lang.reflect.Field;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.compress.utils.Lists;
@@ -54,13 +59,11 @@
*/
@RestController
@RequestMapping("/pc/l/wh/form/transfer")
-@Api(tags = "璋冩嫧鍒嗗彂绠＄悊")
+@Api(value = "璋冩嫧鍒嗗彂绠＄悊", tags = "璋冩嫧鍒嗗彂绠＄悊")
public class LWhFormTransferController extends BaseController {
@Autowired
private LWhFormTransferServiceImpl lWhFormTransferService;
- @Autowired
- private BaseWarehouseServiceImpl baseWarehouseService;
@Autowired
private LWhProcureModelService lWhProcureModelService;
@Autowired
@@ -71,6 +74,8 @@
private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
@Autowired
private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+ @Autowired
+ private BaseWarehouseServiceImpl baseWarehouseService;
/**
* @Description 鏂板
@@ -78,16 +83,16 @@
@ApiOperation(value = "鍗曟嵁鏂板", notes = "鍗曟嵁鏂板")
@ApiImplicitParam(name = "param", value = "鍗曟嵁鏂板", required = true, dataType = "LWhFormTransferParam")
@PostMapping("/add")
- public ResponseValue add(@RequestBody LWhFormTransferParam param) {
+ public ResponseValue add(@RequestBody LWhFormTransferParam param) throws Exception {
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- List<LWhProcureModelParams> transferGoods = param.getModels();
+ List<LWhFormTransferGoodsInfoParam> transferGoods = param.getTransferGoods();
if (CollectionUtils.isEmpty(transferGoods)) {
return ResponseValue.error("璋冩嫧鍗曚笉鑳戒负绌�");
}
- int result = this.lWhFormTransferService.add(param, currentUser, this.getSysInfo());
+ int result = this.lWhFormTransferService.add(param, this.getSysInfo());
if (result > 0) {
return ResponseValue.success(1);
}
@@ -98,26 +103,52 @@
* @Description 鍒楄〃鏌ヨ(璋冩嫧鏄庣粏)
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
+ * <p>
+ * 1.鏌ヨ璋冩嫧鍗�
+ * <p>
+ * 2.鏌ヨ鐗╁搧鍨嬪彿
*/
-// 1.鏌ヨ璋冩嫧鍗�
-// 2.鏌ヨ鐗╁搧鍨嬪彿
+ @ApiOperation(value = "鍗曟嵁鍒楄〃鏌ヨ", notes = "鍗曟嵁鍒楄〃鏌ヨ")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "椤电爜", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "size", value = "姣忛〉鏉℃暟", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "param", value = "鏉′欢鍙傛暟", required = true, dataType = "TransferQry"),
+ })
@GetMapping("/list")
- public ResponseValue queryFormTransferList(TransferQryDto param) {
+ public ResponseValue queryFormTransferList(TransferQry param) {
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- FinSysTenantUser sysInfo = getSysInfo();
-
- //鍙兘鏌ヨ鏈骇 鍙婁互涓嬫満鏋勭殑璋冩嫧鍗�
- //??????
-
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
GenericPager genericPager = lWhFormTransferService.queryFormTransferList(param);
List<LWhFormTransfer> datas = genericPager.getDatas();
- ArrayList<LWhFormTransferVo> newDatas = new ArrayList<>();
+ ArrayList<FormTransferVO> result = new ArrayList<>();
if (!CollectionUtils.isEmpty(datas)) {
datas.forEach(item -> {
+ FormTransferVO formTransferVO = new FormTransferVO();
+ BeanUtils.copyProperties(item, formTransferVO);
+
+ List<FromTransferTemplateInfoVO> templateInfoList = Lists.newArrayList();
+
// 鏌ヨ鍨嬪彿鏁伴噺
+ String sql = "SELECT bgt.id,bgm.GOODS_TEMPLATES_ID,GOODS_NAME,sum( counts ) count FROM "
+ + "l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON pm.BASE_GOODS_MODELS_ID = bgm.id "
+ + "LEFT JOIN base_goods_template bgt ON bgm.GOODS_TEMPLATES_ID = bgt.id "
+ + "WHERE pm.BUSINESS_ID =:id GROUP BY bgm.GOODS_TEMPLATES_ID";
+ Map<String, Object> paramMap = new HashMap<>();
+ paramMap.put("id", item.getId());
+ List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap, new MapperUtil());
+ for (Map<String, Object> map : procureModelList) {
+ FromTransferTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FromTransferTemplateInfoVO.class);
+ templateInfoList.add(procureTemplateInfoVO);
+ }
+ formTransferVO.setFromTransferTemplateInfoList(templateInfoList);
+
+ result.add(formTransferVO);
+
+
+ /*// 鏌ヨ鍨嬪彿鏁伴噺
LWhProcureModel lWhProcureModel = new LWhProcureModel();
Integer businessType = item.getBusinessType();
// TODO 璋冩嫧=0 鍒嗗彂=1 閫�鍥�=2
@@ -130,10 +161,6 @@
break;
}
lWhProcureModel.setBusinessId(item.getId());
-
- LWhFormTransferVo formTransferExtend = new LWhFormTransferVo();
- BeanUtils.copyProperties(item, formTransferExtend);
-
List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel);
List<LWhProcureModelVo> lWhProcureModelVoList = new ArrayList<>();
if (!CollectionUtils.isEmpty(models)) {
@@ -153,15 +180,14 @@
lWhProcureModelVoList.add(lWhProcureModelVo);
});
}
-
formTransferExtend.setModels(lWhProcureModelVoList);
- newDatas.add(formTransferExtend);
+ newDatas.add(formTransferExtend);*/
});
}
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
fieldDatas.setAccessible(true);
- fieldDatas.set(genericPager, newDatas);
+ fieldDatas.set(genericPager, result);
} catch (Exception e) {
e.printStackTrace();
}
@@ -173,13 +199,32 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
+ @ApiOperation(value = "鏍规嵁id鏌ヨ璇︽儏", notes = "鏍规嵁id鏌ヨ璇︽儏")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
+ })
@GetMapping("/detail")
public ResponseValue getById(Long id) {
if (id == null) {
return ResponseValue.error("璋冩嫧鍗昳d涓虹┖");
}
- LWhFormTransferVo vo = this.lWhFormTransferService.getById(id);
+ LWHFromTransferExtendVO vo = this.lWhFormTransferService.getById(id);
return ResponseValue.success(vo);
+ }
+
+ @ApiOperation(value = "璋冩嫧鏄庣粏鍒楄〃", notes = "璋冩嫧鏄庣粏鍒楄〃")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "param", value = "鏉′欢", required = true, dataType = "TransferQry"),
+ })
+ @GetMapping("/detail/list")
+ public ResponseValue queryFormTransferDetailList(TransferQry param) {
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ GenericPager<Map<String, Object>> mapGenericPager = lWhFormTransferService.queryFormTransferDetailList(param);
+
+ return ResponseValue.success(mapGenericPager);
}
/**
@@ -188,6 +233,10 @@
* @author 鍗㈠簡闃�
* @date 2023/10/31
*/
+ @ApiOperation(value = "鎾ら攢", notes = "鎾ら攢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
+ })
@PostMapping("/updStatus")
public ResponseValue updateStatus(Long id) {
if (id == null) {
@@ -203,6 +252,10 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
+ @ApiOperation(value = "璋冩嫧鍏ュ簱", notes = "璋冩嫧鍏ュ簱")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
+ })
@PostMapping("/income")
public ResponseValue income(Long id) {
lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser());
@@ -214,8 +267,26 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
+ @ApiOperation(value = "璋冩嫧鍑哄簱", notes = "璋冩嫧鍑哄簱")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
+ })
@PostMapping("/output")
public ResponseValue output(Long id) {
+ // 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱
+ FinSysTenantUser sysTenantUser = this.getSysInfo();
+ String agencyId = sysTenantUser.getTenantId();
+ List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getByAgencyId(Long.valueOf(agencyId), (short) 1, (short) 1);
+ if (CollectionUtils.isEmpty(baseWarehouseList)) {
+ return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
+ }
+ BaseWarehouse baseWarehouse = baseWarehouseList.get(0);
+ Long wareHouseId = baseWarehouse.getId();
+ String warehouseName = baseWarehouse.getWarehouseName();
+ LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(id);
+ lWhFormTransfer.setOutWarehouseId(wareHouseId);
+ lWhFormTransfer.setOutWarehouseName(warehouseName);
+ lWhFormTransferService.update(lWhFormTransfer);
lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
return ResponseValue.success();
}
@@ -238,7 +309,7 @@
/**
* 閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏
*
- * @param transferQryDto
+ * @param transferQry
* @return
*/
@ApiOperation(value = "閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏", notes = "閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏")
@@ -246,13 +317,13 @@
@ApiImplicitParam(name = "transferQryDto", value = "璋冩嫧鍗曟煡璇㈡潯浠�", required = true)
})
@GetMapping("/department/list")
- public ResponseValue departmentTransferList(TransferQryDto transferQryDto) {
+ public ResponseValue departmentTransferList(TransferQry transferQry) {
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- GenericPager<Map<String, Object>> transferInfoDetailsVoGenericPager = this.lWhFormTransferService.queryTransferInfo(transferQryDto);
+ GenericPager<Map<String, Object>> transferInfoDetailsVoGenericPager = this.lWhFormTransferService.queryTransferInfo(transferQry);
return ResponseValue.success(transferInfoDetailsVoGenericPager);
}
@@ -367,10 +438,9 @@
@GetMapping("/query/detail")
public ResponseValue queryDepartmentTransferOrder(Long agencyId) {
-
-
-
TransferInfoVO transferInfoVO = new TransferInfoVO();
+
+ lWhFormTransferService.queryDepartmentTransferOrder();
return ResponseValue.success(transferInfoVO);
}
}
--
Gitblit v1.9.1