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/LWhFormProcureController.java | 221 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 163 insertions(+), 58 deletions(-)
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 3b24f16..ed68075 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
@@ -4,37 +4,72 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.pojo.LWhFormProcureExtend;
-import com.consum.base.pojo.LWhFormProcureGoodsParams;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.core.utils.MapUtils;
+import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.core.utils.PageUtil;
+import com.consum.base.pojo.LWhFormProcureGoodsInfoParam;
import com.consum.base.pojo.LWhFormProcureParam;
-import com.consum.base.pojo.LWhProcureModelParams;
-import com.consum.base.service.*;
-import com.consum.model.po.*;
+import com.consum.base.pojo.LWhProcureModelParam;
+import com.consum.base.pojo.query.FormProcureQry;
+import com.consum.base.pojo.response.FormProcureVO;
+import com.consum.base.pojo.response.FromProcureTemplateInfoVO;
+import com.consum.base.pojo.response.GoodsModelVO;
+import com.consum.base.pojo.response.LWhFormProcureExtendVO;
+import com.consum.base.pojo.response.LWhFormProcureGoodsVO;
+import com.consum.base.service.BaseGoodsTemplateServiceImpl;
+import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.FinSysTenantServiceImpl;
+import com.consum.base.service.LOrgSupplierServiceImpl;
+import com.consum.base.service.LWhFormProcureCoreService;
+import com.consum.base.service.LWhFormProcureGoodsService;
+import com.consum.base.service.LWhFormProcureService;
+import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.LWhProcureModelService;
+import com.consum.model.po.BaseGoodsTemplate;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LOrgSupplier;
+import com.consum.model.po.LWhFormProcure;
+import com.consum.model.po.LWhFormProcureGoods;
+import com.consum.model.po.LWhProcureModel;
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.web.bind.annotation.*;
-
-import javax.annotation.Resource;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import java.lang.reflect.Field;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import javax.annotation.Resource;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.BeanUtils;
+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;
/**
* @ClassName LWhFormProcureController
- * @Author cy
* @Date 2023/10/27
* @Description
* @Version 1.0
**/
+@Api(value = "浠撳簱琛ㄥ崟閲囪喘", tags = "浠撳簱琛ㄥ崟閲囪喘")
@RestController
@RequestMapping("/pc/whForm/procure")
public class LWhFormProcureController extends BaseController {
+
@Resource
private LWhFormProcureService lWhFormProcureService;
@Resource
@@ -53,6 +88,8 @@
private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
@Resource
private LWhProcureModelService lWhProcureModelService;
+ @Resource
+ private LOrgSupplierServiceImpl lOrgSupplierService;
/**
* @Description 鏂板
@@ -64,11 +101,11 @@
return ResponseValue.error("浠撳簱ID涓嶈兘涓虹┖");
}
BaseWarehouse baseWarehouse = baseWarehouseService.getById(warehouseId);
- // 鍙兘娣诲姞鏈満鏋勪粨搴撶殑杩涜揣鍗�
- //??????
- //
+ FinSysTenantUser sysTenantUser = this.getSysInfo();
+ String tenantId = sysTenantUser.getTenantId();
+ String tenantName = sysTenantUser.getTenantName();
- List<LWhFormProcureGoodsParams> procureGoods = param.getProcureGoods();
+ List<LWhFormProcureGoodsInfoParam> procureGoods = param.getProcureGoods();
if (CollectionUtils.isEmpty(procureGoods)) {
return ResponseValue.error("閲囪喘鍗曚笉鑳戒负绌�");
}
@@ -79,17 +116,24 @@
if (whFormProcureId == null) {
whFormProcureId = NumberGenerator.getLongSequenceNumber();
}
- long procureTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
+ long procureTime = Long.valueOf(param.getProcureTime());
+
+ Set<String> supplierList = new HashSet<>();
ArrayList<LWhFormProcureGoods> procureGoodList = new ArrayList<>();
- ArrayList<LWhProcureModel> whProcureModeLlist = new ArrayList<>();
+ ArrayList<LWhProcureModel> procureModelList = new ArrayList<>();
for (int i = 0; i < procureGoods.size(); i++) {
- LWhFormProcureGoodsParams procureGoodT = procureGoods.get(i);
+ LWhFormProcureGoodsInfoParam procureGoodT = procureGoods.get(i);
Long baseCategoryId = procureGoodT.getBaseCategoryId();
Long baseGoodsTemplateId = procureGoodT.getBaseGoodsTemplateId();
String supplier = procureGoodT.getSupplier();
- List<LWhProcureModelParams> models = procureGoodT.getModels();
+ // 鍒ゆ柇褰撳墠渚涘簲鍟嗘槸鍚﹀凡瀛樺湪
+ if (!supplierList.contains(supplier) && !lOrgSupplierService.supplierIsContain(tenantId, supplier)) {
+ supplierList.add(supplier);
+ }
+
+ List<LWhProcureModelParam> models = procureGoodT.getModels();
if (CollectionUtils.isEmpty(models)) {
return ResponseValue.error("閲囪喘鍗曚笉鑳戒负绌�");
}
@@ -99,10 +143,11 @@
procureGood.setWhFormProcureId(whFormProcureId);
procureGood.setBaseCategoryId(baseCategoryId);
procureGood.setBaseGoodsTemplateId(baseGoodsTemplateId);
- procureGood.setGoodsTemplateName(null);
+ // TODO 鐗╁搧鍘嗗彶鐗堟湰
+ procureGood.setGoodsTemplateName(procureGoodT.getGoodsTemplateName());
procureGood.setSupplier(supplier);
procureGood.setSort(i);
- for (LWhProcureModelParams modelT : models) {
+ for (LWhProcureModelParam modelT : models) {
Integer counts = modelT.getCounts();
if (counts == null || counts <= 0) {
return ResponseValue.error("鍨嬪彿鐨勯噰璐暟閲忓彧鑳戒负姝ｆ暣鏁�");
@@ -120,29 +165,32 @@
if (tempGoodsInfo == null) {
return ResponseValue.error("閲囪喘鐨勪环鍨嬪彿鏈壘鍒�");
}
+ String modelName = (String) tempGoodsInfo.get("modelname");
// 鏌ヨ鍨嬪彿搴撳瓨
- int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
LWhProcureModel model = new LWhProcureModel();
model.setId(NumberGenerator.getLongSequenceNumber());
model.setFromProcureGoodsId(fromProcureGoodsId);
model.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);
model.setBusinessId(whFormProcureId);
model.setBaseGoodsModelsId(baseGoodsModelsId);
+ model.setBaseGoodsModelsName(modelName);
model.setPrice(price);
model.setCounts(counts);
model.setWorehouseCount(goodsModelNum);
model.setSupplier(supplier);
- whProcureModeLlist.add(model);
+ model.setTotalAmount(price * counts);
+ procureModelList.add(model);
}
procureGoodList.add(procureGood);
}
lWhFormProcureGoodsService.insertBatch(procureGoodList);
- lWhProcureModelService.insertBatch(whProcureModeLlist);
+ lWhProcureModelService.insertBatch(procureModelList);
// 鎻掑叆 閲囪喘鍗曠墿鍝併�怢_WH_FORM_PROCURE_GOODS銆�
LWhFormProcure lWhFormProcure = new LWhFormProcure();
lWhFormProcure.setId(whFormProcureId);
- lWhFormProcure.setBusinessFormCode(codeGeneratorService.createCodeByPrefix(CodeGeneratorEnum.Procure_Warehouse.getValue(), 10));
+ lWhFormProcure.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Procure_Warehouse));
lWhFormProcure.setWarehouseId(warehouseId);
lWhFormProcure.setWarehouseName(baseWarehouse.getWarehouseName());
lWhFormProcure.setBuyerId(currentUser.getId());
@@ -154,48 +202,74 @@
lWhFormProcure.setAgencyId(baseWarehouse.getAgencyId());
lWhFormProcure.setAgencyName(baseWarehouse.getAgencyName());
int result = lWhFormProcureService.insert(lWhFormProcure);
- if (result > 0) return ResponseValue.success(1);
+
+ supplierList.forEach(supplier -> {
+ LOrgSupplier lOrgSupplier = new LOrgSupplier();
+ lOrgSupplier.setId(NumberGenerator.getLongSequenceNumber());
+ lOrgSupplier.setAgencyId(tenantId);
+ lOrgSupplier.setAgencyName(tenantName);
+ lOrgSupplier.setSupplier(supplier);
+ lOrgSupplierService.insert(lOrgSupplier);
+ });
+ if (result > 0) {
+ return ResponseValue.success(1);
+ }
return ResponseValue.error("鏂板澶辫触锛�");
}
/**
* @Description 鍒楄〃鏌ヨ
*/
+ @ApiOperation(value = "閲囪喘鍗曞垪琛ㄦ煡璇�", notes = "閲囪喘鍗曞垪琛ㄦ煡璇�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "param", value = "閲囪喘鏌ヨ鏉′欢", required = true, dataType = "FormProcureQryDto", paramType = "query")
+ })
@GetMapping("/list")
- public ResponseValue queryFormProcureList(LWhFormProcureParam param) {
+ public ResponseValue queryFormProcureList(FormProcureQry param) {
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- FinSysTenantUser sysInfo = getSysInfo();
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ String tenantId = sysInfo.getTenantId();
+ if (param.getAgencyId() == null) {
+ param.setAgencyId(Long.valueOf(tenantId));
+ }
+ PageUtil genericPager = lWhFormProcureService.queryFormProcureList(param);
+ List<LWhFormProcure> data = genericPager.getDatas();
+ ArrayList<FormProcureVO> result = new ArrayList<>();
+ if (!CollectionUtils.isEmpty(data)) {
+ data.forEach(item -> {
- //鍙兘鏌ヨ鏈骇 鍙婁互涓嬫満鏋勭殑杩涜揣鍗�
- //??????
+ FormProcureVO fromProcureVO = new FormProcureVO();
+ BeanUtils.copyProperties(item, fromProcureVO);
+ List<FromProcureTemplateInfoVO> procureTemplateInfoList = Lists.newArrayList();
- GenericPager genericPager = lWhFormProcureService.queryFormProcureList(param);
- List<LWhFormProcure> datas = genericPager.getDatas();
- ArrayList<LWhFormProcureExtend> newDatas = new ArrayList<>();
- if (!CollectionUtils.isEmpty(datas)) {
- datas.forEach(item -> {
// 鏌ヨ鍨嬪彿鏁伴噺
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- lWhProcureModel.setBusinessType(1);
- lWhProcureModel.setBusinessId(item.getId());
- List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel);
- LWhFormProcureExtend formProcureExtend = new LWhFormProcureExtend();
- BeanUtils.copyProperties(item, formProcureExtend);
- formProcureExtend.setModels(models);
- newDatas.add(formProcureExtend);
+ String sql = "select fpg.id,BASE_CATEGORY_ID ,BASE_GOODS_TEMPLATE_ID ,GOODS_TEMPLATE_NAME ,sum(counts) count "
+ + "from L_WH_FORM_PROCURE_GOODS fpg left join L_WH_PROCURE_MODEL pm on fpg.id = pm.FROM_PROCURE_GOODS_ID "
+ + "where fpg.WH_FORM_PROCURE_ID =:id group by pm.FROM_PROCURE_GOODS_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) {
+ FromProcureTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FromProcureTemplateInfoVO.class);
+ procureTemplateInfoList.add(procureTemplateInfoVO);
+ }
+ fromProcureVO.setFromProcureTemplateInfoList(procureTemplateInfoList);
+
+ result.add(fromProcureVO);
});
}
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
fieldDatas.setAccessible(true);
- fieldDatas.set(genericPager, newDatas);
+ fieldDatas.set(genericPager, result);
} catch (Exception e) {
e.printStackTrace();
}
-// genericPager.setDatas(newDatas);
+ genericPager.setDatas(result);
return ResponseValue.success(genericPager);
}
@@ -257,8 +331,11 @@
return ResponseValue.error("閲囪喘鍗昳d涓虹┖");
}
LWhFormProcure lWhFormProcure = lWhFormProcureService.get(new LWhFormProcure(id));
- LWhFormProcureExtend formProcureExtend = new LWhFormProcureExtend();
- BeanUtils.copyProperties(lWhFormProcure, formProcureExtend);
+ if (lWhFormProcure == null) {
+ return ResponseValue.error("閲囪喘鍗曚笉瀛樺湪");
+ }
+ LWhFormProcureExtendVO lWhFormProcureExtendVO = new LWhFormProcureExtendVO();
+ BeanUtils.copyProperties(lWhFormProcure, lWhFormProcureExtendVO);
// 鐗╁搧
LWhFormProcureGoods lWhFormProcureGoods = new LWhFormProcureGoods();
@@ -267,24 +344,52 @@
Field fieldModels = null;
try {
- fieldModels = LWhFormProcureGoodsParams.class.getDeclaredField("models");
+ fieldModels = LWhFormProcureGoodsVO.class.getDeclaredField("models");
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
fieldModels.setAccessible(true);
- ArrayList<LWhFormProcureGoodsParams> procureGoodsParams = new ArrayList<>();
+ ArrayList<LWhFormProcureGoodsVO> procureGoodsVOList = new ArrayList<>();
for (LWhFormProcureGoods formProcureGood : formProcureGoods) {
- LWhFormProcureGoodsParams lWhFormProcureGoodsParams = new LWhFormProcureGoodsParams();
- BeanUtils.copyProperties(formProcureGood, lWhFormProcureGoodsParams);
+ LWhFormProcureGoodsVO lWhFormProcureGoodsVO = new LWhFormProcureGoodsVO();
+ BeanUtils.copyProperties(formProcureGood, lWhFormProcureGoodsVO);
+ Long baseGoodsTemplateId = formProcureGood.getBaseGoodsTemplateId();
+ BaseGoodsTemplate queryEntity = new BaseGoodsTemplate();
+ queryEntity.setId(baseGoodsTemplateId);
+ BaseGoodsTemplate baseGoodsTemplate = baseGoodsTemplateService.get(queryEntity);
+ lWhFormProcureGoodsVO.setBaseCategoryName(baseGoodsTemplate.getCategoryName());
// 鏌ヨ鍨嬪彿鏁伴噺
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- lWhProcureModel.setFromProcureGoodsId(formProcureGood.getId());
- List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel);
- fieldModels.set(lWhFormProcureGoodsParams, models);
- procureGoodsParams.add(lWhFormProcureGoodsParams);
+ Map<String, Object> paramMap = new HashMap<>();
+ paramMap.put("formProcureGoodId", formProcureGood.getId());
+ String sql = "SELECT\n" + "pm.BASE_GOODS_MODELS_ID,pm.BASE_GOODS_MODELS_NAME,pm.PRICE,pm.COUNTS,pm.WOREHOUSE_COUNT,bgm.unit " + "FROM\n"
+ + "\tl_wh_procure_model pm\n"
+ + "\tLEFT JOIN base_goods_models bgm on pm.BASE_GOODS_MODELS_ID = bgm.id where pm.FROM_PROCURE_GOODS_ID =:formProcureGoodId";
+ List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap, new MapperUtil());
+ List<GoodsModelVO> goodsModelVOList = Lists.newArrayList();
+ procureModelList.forEach(item -> {
+ GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class);
+ goodsModelVOList.add(goodsModelVO);
+ });
+ fieldModels.set(lWhFormProcureGoodsVO, goodsModelVOList);
+ procureGoodsVOList.add(lWhFormProcureGoodsVO);
}
- formProcureExtend.setProcureGoods(procureGoodsParams);
- return ResponseValue.success("鏌ヨ鎴愬姛!", formProcureExtend);
+ lWhFormProcureExtendVO.setProcureGoods(procureGoodsVOList);
+ return ResponseValue.success("鏌ヨ鎴愬姛!", lWhFormProcureExtendVO);
+ }
+
+
+ @ApiOperation(value = "閲囪喘鍗曟槑缁嗘煡璇�", notes = "閲囪喘鍗曟槑缁嗘煡璇�")
+ @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "閲囪喘鍗曟槑缁嗘煡璇�", required = true, dataType = "FormProcureQryDto", paramType = "query")})
+ @GetMapping("detail/list")
+ public ResponseValue queryFormProcureDetailList() {
+ FormProcureQry formProcureQry = CommonUtil.getObjFromReq(FormProcureQry.class);
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+
+ GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(formProcureQry);
+ return ResponseValue.success(genericPager);
}
}
--
Gitblit v1.9.1