From 5112320c542900d9e79bbc0938b195a43e3fc255 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 23 十一月 2023 17:34:54 +0800
Subject: [PATCH] --部门物品分发
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 98 +++++++++++++++++++++++++-----------------------
1 files changed, 51 insertions(+), 47 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 24c767c..95b1d21 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
@@ -5,22 +5,24 @@
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.ProcureModelInfoDto;
import com.consum.base.pojo.UseRecordDto;
import com.consum.base.pojo.UseRecordSkuDto;
import com.consum.base.pojo.query.TransferQry;
+import com.consum.base.pojo.request.LWhFormTransferParam;
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;
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.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;
@@ -57,7 +59,7 @@
*/
@RestController
@RequestMapping("/pc/l/wh/form/transfer")
-@Api(tags = "璋冩嫧鍒嗗彂绠＄悊")
+@Api(value = "璋冩嫧鍒嗗彂绠＄悊", tags = "璋冩嫧鍒嗗彂绠＄悊")
public class LWhFormTransferController extends BaseController {
@Autowired
@@ -72,6 +74,8 @@
private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
@Autowired
private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+ @Autowired
+ private BaseWarehouseServiceImpl baseWarehouseService;
/**
* @Description 鏂板
@@ -116,7 +120,7 @@
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
-
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
GenericPager genericPager = lWhFormTransferService.queryFormTransferList(param);
List<LWhFormTransfer> datas = genericPager.getDatas();
ArrayList<FormTransferVO> result = new ArrayList<>();
@@ -142,42 +146,6 @@
formTransferVO.setFromTransferTemplateInfoList(templateInfoList);
result.add(formTransferVO);
-
-
- /*// 鏌ヨ鍨嬪彿鏁伴噺
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- 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);
- 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);*/
});
}
try {
@@ -206,6 +174,21 @@
}
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);
}
/**
@@ -254,6 +237,20 @@
})
@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();
}
@@ -294,12 +291,11 @@
return ResponseValue.success(transferInfoDetailsVoGenericPager);
}
- /**
- * 閮ㄩ棬鐗╁搧浣跨敤璁板綍
- *
- * @param procureModelInfoDto
- * @return
- */
+
+ @ApiOperation(value = "浣跨敤浜轰慨鏀�", notes = "浣跨敤浜轰慨鏀�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "procureModelInfoDto", value = "浣跨敤淇℃伅", required = true)
+ })
@PostMapping("/useInfo/update")
public ResponseValue infoUpdate(@RequestBody List<ProcureModelInfoDto> procureModelInfoDto) {
@@ -352,6 +348,10 @@
* @param transferOrderId
* @return
*/
+ @ApiOperation(value = "閮ㄩ棬鐗╁搧浣跨敤浜鸿褰�", notes = "閮ㄩ棬鐗╁搧浣跨敤浜鸿褰�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "transferOrderId", value = "璋冩嫧鍗昳d", required = true)
+ })
@GetMapping("/use/record")
public ResponseValue useRecord(Long transferOrderId) {
@@ -361,6 +361,8 @@
}
LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
lWhProcureModelUserRecord.setTransBusinessId(transferOrderId);
+ String sql =
+ "select * from l_wh_procure_model_user_record pmur inner join l_wh_procure_model_user pmu on pmur.TRANS_BUSINESS_ID = pmu. " + transferOrderId;
List<LWhProcureModelUserRecord> modelUserRecords = lWhProcureModelUserRecordService.select(lWhProcureModelUserRecord);
List<UseRecordDto> result = Lists.newArrayList();
@@ -369,10 +371,10 @@
UseRecordDto useRecordDto = new UseRecordDto();
useRecordDto.setId(id);
useRecordDto.setUpdateUserName(item.getOperatorName());
- useRecordDto.setUpdateTime(DateUtils.toShowDate(item.getDealTime()));
+ useRecordDto.setUpdateTime(item.getDealTime());
LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
- lWhProcureModelUser.setWhProcureModelId(id);
+ lWhProcureModelUser.setProcureModelUserRecordId(id);
List<LWhProcureModelUser> procureModelUserList = lWhProcureModelUserService.select(lWhProcureModelUser);
List<UseRecordSkuDto> recordSkuDtoList = Lists.newArrayList();
@@ -406,6 +408,8 @@
public ResponseValue queryDepartmentTransferOrder(Long agencyId) {
TransferInfoVO transferInfoVO = new TransferInfoVO();
+
+ lWhFormTransferService.queryDepartmentTransferOrder();
return ResponseValue.success(transferInfoVO);
}
}
--
Gitblit v1.9.1