diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java index 3fb0e5f5..5e05b495 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java @@ -299,10 +299,6 @@ public class StockOrderDetailController { return ResultVOUtils.error(500, "未选择产品！"); } for (StockSelectDataEntity stockSelectDataEntity : stockOrderIdsRequest.getDatas()) { - CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest(); - companyProductRelevanceRequest.setId(stockSelectDataEntity.getRelId()); - companyProductRelevanceRequest.setDiType(1); - companyProductRelevanceRequest.setCustomerId(getCustomerId()); List companyProductRelevanceResponses = new ArrayList<>(); FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); filterUdiInfoRequest.setId(stockSelectDataEntity.getRelId()); @@ -327,6 +323,7 @@ public class StockOrderDetailController { stockOrderDetailEntity.setBatchNo(stockSelectDataEntity.getBatchNo()); stockOrderDetailEntity.setProductDate(stockSelectDataEntity.getProductDate()); stockOrderDetailEntity.setExpireDate(stockSelectDataEntity.getExpireDate()); + stockOrderDetailEntity.setSupId(stockSelectDataEntity.getSupId()); stockOrderDetailEntity.setManufactory(udiInfoEntity.getManufactory()); stockOrderDetailEntity.setMeasname(udiInfoEntity.getMeasname()); stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc()); @@ -658,7 +655,6 @@ public class StockOrderDetailController { /** * 更新单据详情信息 * - * @param stockOrderDetailEntities * @return */ @AuthRuleAnnotation("") diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java index 808047b7..01d51ba0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java @@ -7,10 +7,7 @@ import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.annotation.RepeatSubmit; import com.glxp.api.admin.constant.Constant; import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.api.admin.entity.basic.*; import com.glxp.api.admin.entity.business.StockOrderDetailEntity; import com.glxp.api.admin.entity.business.StockOrderEntity; import com.glxp.api.admin.entity.inout.WarehouseEntity; @@ -23,10 +20,12 @@ import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.res.purchase.PurPlanResponse; import com.glxp.api.admin.service.auth.CustomerService; +import com.glxp.api.admin.service.basic.BasicBusTypeChangeService; import com.glxp.api.admin.service.basic.BasicUnitMaintainService; import com.glxp.api.admin.service.basic.BussinessLocalTypeService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.business.StockOrderDetailService; +import com.glxp.api.admin.service.business.StockOrderService; import com.glxp.api.admin.service.purchase.IPurPlanDetailService; import com.glxp.api.admin.service.purchase.IPurPlanService; import com.glxp.api.admin.util.DateUtil; @@ -68,11 +67,13 @@ public class PurPlanController { @Resource BasicUnitMaintainService basicUnitMaintainService; @Resource - BussinessLocalTypeService bussinessLocalTypeService; - @Resource UdiRelevanceService udiRelevanceService; @Resource StockOrderDetailService stockOrderDetailService; + @Resource + BasicBusTypeChangeService basicBusTypeChangeService; + @Resource + StockOrderService stockOrderService; /** * 新增采购计划 @@ -84,6 +85,7 @@ public class PurPlanController { Integer userId = customerService.getUserId(); PurPlanEntity purApplyEntity = postPurPlanRequest.getPurPlanEntity(); + purApplyEntity.setCreateBy(userId + ""); purApplyEntity.setCreateTime(new Date()); purApplyEntity.setUpdateTime(new Date()); @@ -110,6 +112,66 @@ public class PurPlanController { } + return ResultVOUtils.success("提交成功！"); + } + + + /** + * 查询采购计划列表 + */ + @GetMapping("/purchase/plan/list") + public BaseResponse list(PurPlanRequest purApplyRequest) { + + if (purApplyRequest.getStatus() == null) { + purApplyRequest.setStatus(11); //查询未审核和草稿状态 + } + + List purApplyEntities = purPlanService.queryPageList(purApplyRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purApplyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(purApplyEntities); + return ResultVOUtils.success(pageSimpleResponse); + + } + + + /** + * 查询采购计划列表 + */ + @GetMapping("/purchase/plan/auditList") + public BaseResponse auditList(PurPlanRequest purApplyRequest) { + + if (purApplyRequest.getStatus() == null) { + purApplyRequest.setStatus(10); //查询未审核和已审核状态 + } + List purApplyEntities = purPlanService.queryPageList(purApplyRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purApplyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(purApplyEntities); + return ResultVOUtils.success(pageSimpleResponse); + + } + + + /** + * 审核采购计划 + */ + @RepeatSubmit() + @PostMapping("/purchase/plan/auditOrder") + public BaseResponse auditOrder(@RequestBody PostPurPlanRequest postPurPlanRequest) { + Integer userId = customerService.getUserId(); + PurPlanEntity purApplyEntity = postPurPlanRequest.getPurPlanEntity(); + purApplyEntity.setUpdateTime(new Date()); + purApplyEntity.setAuditBy(userId + ""); + purApplyEntity.setStatus(postPurPlanRequest.getEditStatus()); + purPlanService.update(purApplyEntity); + + List purPlanDetailEntities = purPlanDetailService.findByOrderId(purApplyEntity.getId() + ""); + //转换成业务单据 if (postPurPlanRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) { @@ -143,18 +205,17 @@ public class PurPlanController { stockOrderEntity.setBilldate(DateUtil.formatDateTime(new Date())); stockOrderEntity.setStatus(ConstantStatus.SORDER_ALLOC); //todo - BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByName("采购入库单"); - stockOrderEntity.setBillType(bussinessLocalTypeEntity.getLocalAction()); + BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.findByAction("purplan"); + stockOrderEntity.setBillType(basicBusTypeChangeEntity.getTargetBusAction()); stockOrderEntity.setInvWarehouseCode(purApplyEntity.getInvWarehouseCode()); stockOrderEntity.setLocStorageCode(purApplyEntity.getLocStorageCode()); stockOrderEntity.setDept(purApplyEntity.getDeptCode()); - + stockOrderService.insertStockOrder(stockOrderEntity); //3.构建单据详情 List temps = filterSupMaps.get(supId); if (CollUtil.isNotEmpty(temps)) { List stockOrderDetailEntities = new ArrayList<>(); for (PurPlanDetailEntity purPlanDetailEntity : temps) { - StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); UdiRelevanceResponse udiRelevanceEntity = udiRelevanceService.selectGroupById(purPlanDetailEntity.getProductId()); stockOrderDetailEntity.setProductName(udiRelevanceEntity.getCpmctymc()); @@ -169,7 +230,6 @@ public class PurPlanController { stockOrderDetailEntity.setMeasname(udiRelevanceEntity.getMeasname()); stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId()); stockOrderDetailEntities.add(stockOrderDetailEntity); - } if (CollUtil.isNotEmpty(stockOrderDetailEntities)) { stockOrderDetailService.insertStockOrderDetails(stockOrderDetailEntities); @@ -180,61 +240,7 @@ public class PurPlanController { } - return ResultVOUtils.success("提交成功！"); - } - - - /** - * 查询采购计划列表 - */ - @GetMapping("/purchase/plan/list") - public BaseResponse list(PurPlanRequest purApplyRequest) { - - if (purApplyRequest.getStatus() == null) { - purApplyRequest.setStatus(11); //查询未审核和草稿状态 - } - - List purApplyEntities = purPlanService.queryPageList(purApplyRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purApplyEntities); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(purApplyEntities); - return ResultVOUtils.success(pageSimpleResponse); - - } - - /** - * 查询采购计划列表 - */ - @GetMapping("/purchase/plan/auditList") - public BaseResponse auditList(PurPlanRequest purApplyRequest) { - - if (purApplyRequest.getStatus() == null) { - purApplyRequest.setStatus(10); //查询未审核和已审核状态 - } - List purApplyEntities = purPlanService.queryPageList(purApplyRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purApplyEntities); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(purApplyEntities); - return ResultVOUtils.success(pageSimpleResponse); - - } - - - /** - * 审核采购计划 - */ - @RepeatSubmit() - @PostMapping("/purchase/plan/auditOrder") - public BaseResponse auditOrder(@RequestBody PurPlanRequest purApplyRequest) { - - PurPlanEntity purApplyEntity = new PurPlanEntity(); - BeanUtils.copyProperties(purApplyRequest, purApplyEntity); - purPlanService.update(purApplyEntity); return ResultVOUtils.success("更新成功！"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java index e58b5e2d..190a842b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java @@ -44,6 +44,7 @@ public class StockOrderDetailEntity { private int acceptCount; private String measname; + private String supId; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockSelectDataEntity.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockSelectDataEntity.java index 2c58651f..5636ef78 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockSelectDataEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockSelectDataEntity.java @@ -8,4 +8,5 @@ public class StockSelectDataEntity { private String batchNo; private String expireDate; private String productDate; + private String supId; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanDetailService.java index 57755ab4..097894bc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanDetailService.java @@ -12,6 +12,9 @@ public interface IPurPlanDetailService { List joinQueryList(PurPlanDetailRequest purApplyRequest); + + List findByOrderId(String orderId); + List queryPageList(PurPlanDetailRequest purPlanDetailRequest); Boolean insert(PurPlanDetailEntity purPlanDetailRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanDetailServiceImpl.java index b2d0cf0a..b32751b8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanDetailServiceImpl.java @@ -32,6 +32,14 @@ public class PurPlanDetailServiceImpl implements IPurPlanDetailService { return data; } + @Override + public List findByOrderId(String orderId) { + PurPlanDetailRequest purPlanDetailRequest = new PurPlanDetailRequest(); + purPlanDetailRequest.setOrderIdFk(orderId); + List data = purPlanDetailDao.queryPageList(purPlanDetailRequest); + return data; + } + @Override public List queryPageList(PurPlanDetailRequest purPlanDetailRequest) { if (purPlanDetailRequest == null) { diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml index ae9361f1..b040487b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml @@ -27,7 +27,7 @@ insert INTO stock_order(id, billNo, billdate, corpId, corpName, billType, billFlag, - thirdSysFk, status, statusInfo, type, sourceType, + thirdSysFk, status, statusInfo, `type`, sourceType, printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk, totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd, auditTime, updateTime, invWarehouseCode, fromSubInvCode, dept)