|
|
|
|
@ -55,7 +55,6 @@ import java.util.stream.Collectors;
|
|
|
|
|
@RestController
|
|
|
|
|
public class PurPlanController {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
PurPlanService purPlanService;
|
|
|
|
|
@Resource
|
|
|
|
|
@ -123,7 +122,6 @@ public class PurPlanController {
|
|
|
|
|
purPlanService.update(purPlanEntity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return ResultVOUtils.success("提交成功！");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -142,8 +140,7 @@ public class PurPlanController {
|
|
|
|
|
purApplyRequest.setSysApprovalFlow(sys_approval_flow);
|
|
|
|
|
|
|
|
|
|
List<PurPlanResponse> purApplyEntities = purPlanService.queryPageList(purApplyRequest);
|
|
|
|
|
PageInfo<PurPlanResponse> pageInfo;
|
|
|
|
|
pageInfo = new PageInfo<>(purApplyEntities);
|
|
|
|
|
PageInfo<PurPlanResponse> pageInfo = new PageInfo<>(purApplyEntities);
|
|
|
|
|
PageSimpleResponse<PurPlanResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
|
pageSimpleResponse.setList(purApplyEntities);
|
|
|
|
|
@ -166,8 +163,7 @@ public class PurPlanController {
|
|
|
|
|
purApplyRequest.setSysApprovalFlow(sys_approval_flow);
|
|
|
|
|
|
|
|
|
|
List<PurPlanResponse> purApplyEntities = purPlanService.queryPageList(purApplyRequest);
|
|
|
|
|
PageInfo<PurPlanResponse> pageInfo;
|
|
|
|
|
pageInfo = new PageInfo<>(purApplyEntities);
|
|
|
|
|
PageInfo<PurPlanResponse> pageInfo = new PageInfo<>(purApplyEntities);
|
|
|
|
|
PageSimpleResponse<PurPlanResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
|
pageSimpleResponse.setList(purApplyEntities);
|
|
|
|
|
@ -189,8 +185,7 @@ public class PurPlanController {
|
|
|
|
|
purApplyRequest.setSysApprovalFlow(sys_approval_flow);
|
|
|
|
|
|
|
|
|
|
List<PurPlanResponse> purApplyEntities = purPlanService.queryPageList(purApplyRequest);
|
|
|
|
|
PageInfo<PurPlanResponse> pageInfo;
|
|
|
|
|
pageInfo = new PageInfo<>(purApplyEntities);
|
|
|
|
|
PageInfo<PurPlanResponse> pageInfo = new PageInfo<>(purApplyEntities);
|
|
|
|
|
PageSimpleResponse<PurPlanResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
|
pageSimpleResponse.setList(purApplyEntities);
|
|
|
|
|
@ -217,186 +212,12 @@ public class PurPlanController {
|
|
|
|
|
if (purPlanEntity.getStatus() == 3) {
|
|
|
|
|
purPlanEntity = purPlanService.selectById(purPlanEntity.getId());
|
|
|
|
|
purChangeService.purPlanChange(purPlanEntity);
|
|
|
|
|
// generateDocument(purPlanEntity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// String billNo="";
|
|
|
|
|
// List<PurPlanDetailEntity> purPlanDetailEntities = purPlanDetailService.findByOrderId(purApplyEntity.getId() + "");
|
|
|
|
|
//
|
|
|
|
|
// //对计划单里面的供应商进行分组
|
|
|
|
|
// Map<String, List<PurPlanDetailEntity>> map = purPlanDetailEntities.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));
|
|
|
|
|
//
|
|
|
|
|
// if (postPurPlanRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) {
|
|
|
|
|
//
|
|
|
|
|
// if (CollUtil.isNotEmpty(purPlanDetailEntities) && postPurPlanRequest.isAutoPurchase()==true
|
|
|
|
|
// && StrUtil.isNotEmpty(postPurPlanRequest.getTargetSubInv()) && StrUtil.isNotEmpty(postPurPlanRequest.getTargetBillAction()) ) {
|
|
|
|
|
//
|
|
|
|
|
// for (Map.Entry<String, List<PurPlanDetailEntity>> m:map.entrySet()) {
|
|
|
|
|
// //生产单据表信息
|
|
|
|
|
// IoOrderEntity ioOrderEntity=new IoOrderEntity();
|
|
|
|
|
// ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER ,"yyyyMMdd")));
|
|
|
|
|
// ioOrderEntity.setCorpOrderId(CustomUtil.getDate());
|
|
|
|
|
// ioOrderEntity.setMainAction(ConstantType.TYPE_PUT);
|
|
|
|
|
// ioOrderEntity.setAction(postPurPlanRequest.getTargetBillAction());
|
|
|
|
|
// ioOrderEntity.setFromCorp(m.getKey());
|
|
|
|
|
// ioOrderEntity.setFromType(ConstantStatus.FROM_PLAN);
|
|
|
|
|
// ioOrderEntity.setStatus(1);
|
|
|
|
|
// ioOrderEntity.setDealStatus(1);
|
|
|
|
|
// ioOrderEntity.setOrderType(1);
|
|
|
|
|
// ioOrderEntity.setCreateTime(new Date());
|
|
|
|
|
// ioOrderEntity.setCreateUser(postPurPlanRequest.getPurPlanEntity().getAuditUser());
|
|
|
|
|
// ioOrderEntity.setUpdateTime(new Date());
|
|
|
|
|
// ioOrderEntity.setUpdateUser(postPurPlanRequest.getPurPlanEntity().getAuditUser());
|
|
|
|
|
// ioOrderEntity.setCustomerId("110");
|
|
|
|
|
// ioOrderEntity.setDeptCode(postPurPlanRequest.getTargetDeptCode());
|
|
|
|
|
// ioOrderEntity.setInvCode(postPurPlanRequest.getTargetSubInv());
|
|
|
|
|
// ioOrderService.insertOrder(ioOrderEntity);
|
|
|
|
|
// billNo+=ioOrderEntity.getBillNo()+",";
|
|
|
|
|
// //插入业务单表
|
|
|
|
|
// for (PurPlanDetailEntity obj:m.getValue()) {
|
|
|
|
|
// BasicProductsEntity basicProductsEntity = purPlanDetailService.selectIoOrderDetailBiz(obj.getId());
|
|
|
|
|
// IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
|
|
|
|
|
// ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo());
|
|
|
|
|
// ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId()));
|
|
|
|
|
// ioOrderDetailBizEntity.setCount(obj.getCount());
|
|
|
|
|
// ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid());
|
|
|
|
|
// ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode());
|
|
|
|
|
// ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc());
|
|
|
|
|
// ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh());
|
|
|
|
|
// ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc());
|
|
|
|
|
// ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory());
|
|
|
|
|
// ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
|
|
|
|
|
// ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
|
|
|
|
|
// if (basicProductsEntity.getPrice() != null) {
|
|
|
|
|
// ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice()));
|
|
|
|
|
// }
|
|
|
|
|
// ioOrderDetailBizEntity.setSupId(obj.getSupId());
|
|
|
|
|
// ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// purApplyEntity.setStockOrderNo(billNo.substring(0,billNo.length()-1));
|
|
|
|
|
// purPlanService.update(purApplyEntity);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
return ResultVOUtils.success("更新成功！");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//根据单据生成新单据
|
|
|
|
|
public Boolean generateDocument(PurPlanEntity purPlanEntity) {
|
|
|
|
|
BasicBusTypeChangeEntity basicBusTypeChangeEntity = new BasicBusTypeChangeEntity();
|
|
|
|
|
//查询计划详情
|
|
|
|
|
List<PurPlanDetailEntity> purPlanDetailEntityList = purPlanDetailService.findByOrderId(purPlanEntity.getId() + "");
|
|
|
|
|
//---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\
|
|
|
|
|
PurOrderEntity purOrderEntity = new PurOrderEntity();
|
|
|
|
|
if (purPlanEntity.getStatus() == 3) {
|
|
|
|
|
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH);
|
|
|
|
|
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
|
|
|
|
|
purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
|
|
|
|
|
purOrderEntity.setBillDate(purPlanEntity.getBillDate());
|
|
|
|
|
purOrderEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());
|
|
|
|
|
purOrderEntity.setRemark(purPlanEntity.getRemark());
|
|
|
|
|
purOrderEntity.setEmergency(purPlanEntity.getEmergency());
|
|
|
|
|
purOrderEntity.setArrivalTime(purPlanEntity.getArrivalTime());
|
|
|
|
|
purOrderEntity.setInvCode(purPlanEntity.getInvCode());
|
|
|
|
|
purOrderEntity.setDeptCode(purPlanEntity.getDeptCode());
|
|
|
|
|
purOrderEntity.setCreateUser(purPlanEntity.getAuditUser());
|
|
|
|
|
purOrderEntity.setCreateTime(timeProcess(purPlanEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
|
|
|
|
|
purOrderEntity.setUpdateUser(purPlanEntity.getAuditUser());
|
|
|
|
|
purOrderEntity.setUpdateTime(new Date());
|
|
|
|
|
if (purOrderEntity.getStatus() == 3) {
|
|
|
|
|
purOrderEntity.setAuditUser("");
|
|
|
|
|
purOrderEntity.setAuditTime(new Date());
|
|
|
|
|
}
|
|
|
|
|
//插入订单主表
|
|
|
|
|
purOrderService.insert(purOrderEntity);
|
|
|
|
|
//用stream流复制list
|
|
|
|
|
List<PurOrderDetailEntity> purOrderDetailEntityList = purPlanDetailEntityList.stream().map(e -> {
|
|
|
|
|
PurOrderDetailEntity d = new PurOrderDetailEntity();
|
|
|
|
|
d.setOrderIdFk(purOrderEntity.getId() + "");
|
|
|
|
|
d.setProductId(e.getProductId());
|
|
|
|
|
d.setProductName(e.getProductName());
|
|
|
|
|
d.setCount(e.getCount());
|
|
|
|
|
d.setSupId(e.getSupId());
|
|
|
|
|
d.setZczbhhzbapzbh(e.getZczbhhzbapzbh());
|
|
|
|
|
return d;
|
|
|
|
|
}).collect(Collectors.toList());
|
|
|
|
|
purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailEntityList);
|
|
|
|
|
// 更新计划表信息插入订单单号
|
|
|
|
|
PurPlanEntity purPlanEntity1 = new PurPlanEntity();
|
|
|
|
|
purPlanEntity1.setId(purPlanEntity.getId());
|
|
|
|
|
purPlanEntity1.setStockOrderNo(purOrderEntity.getBillNo());
|
|
|
|
|
// purPlanEntity.sets(true);
|
|
|
|
|
purPlanService.update(purPlanEntity1);
|
|
|
|
|
}
|
|
|
|
|
//---------------------------------判断计划为已审核就生成采购入库单-------------------------------------------//\
|
|
|
|
|
//查询申购单详情
|
|
|
|
|
List<PurPlanDetailEntity> purPlanDetailEntities = purPlanDetailService.findByOrderId(purPlanEntity.getId() + "");
|
|
|
|
|
//对计划单里面的供应商进行分组
|
|
|
|
|
Map<String, List<PurPlanDetailEntity>> map = purPlanDetailEntities.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));
|
|
|
|
|
String billNo = "";
|
|
|
|
|
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetAction()) && basicBusTypeChangeEntity.isEnable() == true) {
|
|
|
|
|
for (Map.Entry<String, List<PurPlanDetailEntity>> m : map.entrySet()) {
|
|
|
|
|
//生产单据表信息
|
|
|
|
|
IoOrderEntity ioOrderEntity = new IoOrderEntity();
|
|
|
|
|
ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")));
|
|
|
|
|
ioOrderEntity.setCorpOrderId(CustomUtil.getDate());
|
|
|
|
|
ioOrderEntity.setMainAction(ConstantType.TYPE_PUT);
|
|
|
|
|
ioOrderEntity.setAction(basicBusTypeChangeEntity.getTargetAction());
|
|
|
|
|
ioOrderEntity.setFromCorp(m.getKey());
|
|
|
|
|
ioOrderEntity.setFromType(ConstantStatus.FROM_PLAN);
|
|
|
|
|
ioOrderEntity.setStatus(1);
|
|
|
|
|
ioOrderEntity.setDealStatus(1);
|
|
|
|
|
ioOrderEntity.setOrderType(1);
|
|
|
|
|
ioOrderEntity.setCreateTime(new Date());
|
|
|
|
|
ioOrderEntity.setCreateUser(purPlanEntity.getCreateUser());
|
|
|
|
|
ioOrderEntity.setUpdateTime(new Date());
|
|
|
|
|
ioOrderEntity.setUpdateUser(purPlanEntity.getCreateUser());
|
|
|
|
|
ioOrderEntity.setCustomerId("110");
|
|
|
|
|
ioOrderEntity.setDeptCode(purPlanEntity.getInvCode());
|
|
|
|
|
ioOrderEntity.setInvCode(purPlanEntity.getDeptCode());
|
|
|
|
|
ioOrderService.insertOrder(ioOrderEntity);
|
|
|
|
|
billNo += ioOrderEntity.getBillNo() + ",";
|
|
|
|
|
//插入业务单表
|
|
|
|
|
for (PurPlanDetailEntity obj : m.getValue()) {
|
|
|
|
|
BasicProductsEntity basicProductsEntity = purPlanDetailService.selectIoOrderDetailBiz(obj.getId());
|
|
|
|
|
IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
|
|
|
|
|
ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo());
|
|
|
|
|
ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId()));
|
|
|
|
|
ioOrderDetailBizEntity.setCount(obj.getCount());
|
|
|
|
|
ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid());
|
|
|
|
|
ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode());
|
|
|
|
|
ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc());
|
|
|
|
|
ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh());
|
|
|
|
|
ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc());
|
|
|
|
|
ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory());
|
|
|
|
|
ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
|
|
|
|
|
ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
|
|
|
|
|
if (basicProductsEntity.getPrice() != null) {
|
|
|
|
|
ioOrderDetailBizEntity.setPrice(basicProductsEntity.getPrice());
|
|
|
|
|
}
|
|
|
|
|
ioOrderDetailBizEntity.setSupId(obj.getSupId());
|
|
|
|
|
ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
PurPlanEntity purPlanEntity1 = new PurPlanEntity();
|
|
|
|
|
purPlanEntity1.setId(purPlanEntity.getId());
|
|
|
|
|
purPlanEntity1.setStockOrderNo(billNo.substring(0, billNo.length() - 1));
|
|
|
|
|
purPlanService.update(purPlanEntity1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public Date timeProcess(Date date, Integer timeCount) {
|
|
|
|
|
Calendar rightNow = Calendar.getInstance();
|
|
|
|
|
rightNow.setTime(date);
|
|
|
|
|
rightNow.add(Calendar.HOUR, timeCount);
|
|
|
|
|
Date dt1 = rightNow.getTime();
|
|
|
|
|
return dt1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 查询采购计划列表
|
|
|
|
|
*/
|
|
|
|
|
@ -404,8 +225,7 @@ public class PurPlanController {
|
|
|
|
|
public BaseResponse detailList(PurPlanDetailRequest purApplyDetailRequest) {
|
|
|
|
|
|
|
|
|
|
List<PurOrderDetailResponse> purApplyDetailEntities = purPlanDetailService.joinQueryList(purApplyDetailRequest);
|
|
|
|
|
PageInfo<PurOrderDetailResponse> pageInfo;
|
|
|
|
|
pageInfo = new PageInfo<>(purApplyDetailEntities);
|
|
|
|
|
PageInfo<PurOrderDetailResponse> pageInfo = new PageInfo<>(purApplyDetailEntities);
|
|
|
|
|
PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
|
pageSimpleResponse.setList(purApplyDetailEntities);
|
|
|
|
|
@ -421,8 +241,7 @@ public class PurPlanController {
|
|
|
|
|
public BaseResponse drugDetailList(PurPlanDetailRequest purApplyDetailRequest) {
|
|
|
|
|
|
|
|
|
|
List<PurOrderDetailResponse> purApplyDetailEntities = purPlanDetailService.joinDrugQueryList(purApplyDetailRequest);
|
|
|
|
|
PageInfo<PurOrderDetailResponse> pageInfo;
|
|
|
|
|
pageInfo = new PageInfo<>(purApplyDetailEntities);
|
|
|
|
|
PageInfo<PurOrderDetailResponse> pageInfo = new PageInfo<>(purApplyDetailEntities);
|
|
|
|
|
PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
|
pageSimpleResponse.setList(purApplyDetailEntities);
|
|
|
|
|
@ -474,7 +293,6 @@ public class PurPlanController {
|
|
|
|
|
purPlanDetailRequest.setOrderIdFk(purPlanRequest.getId() + "");
|
|
|
|
|
List<PurPlanDetailEntity> purApplyDetailEntities = purPlanDetailService.getPurPlanDetailEntityList(purPlanDetailRequest);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<Long> ids = new ArrayList<>();
|
|
|
|
|
for (PurPlanDetailEntity obj : purApplyDetailEntities) {
|
|
|
|
|
for (PurPlanDetailEntity obj1 : purPlanDetailEntityList) {
|
|
|
|
|
@ -578,7 +396,6 @@ public class PurPlanController {
|
|
|
|
|
@DeleteMapping("/purchase/plan/detail/{ids}")
|
|
|
|
|
public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
|
|
|
|
|
@PathVariable Long[] ids) {
|
|
|
|
|
|
|
|
|
|
purPlanDetailService.deleteByIds(Arrays.asList(ids));
|
|
|
|
|
return ResultVOUtils.success("删除成功");
|
|
|
|
|
}
|
|
|
|
|
|
qiuyt
4 months ago