UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
郑明梁 3 years ago
parent 3651b54080 ff9fd56cc0
commit 89e4cd3661
5 changed files with 465 additions and 430 deletions
Show Stats Download Patch File Download Diff File

100
src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java
Unescape Escape View File

@ -59,8 +59,6 @@ public class IoPurChangeService {
PurOrderDetailService purOrderDetailService; PurOrderDetailService purOrderDetailService;
@Resource @Resource
GennerOrderUtils gennerOrderUtils; GennerOrderUtils gennerOrderUtils;
@Resource
UdiProductService udiProductService;
@Resource @Resource
IoOrderService ioOrderService; IoOrderService ioOrderService;
@ -72,42 +70,49 @@ public class IoPurChangeService {
purReceiveEntity = receiveService.selectById(purReceiveEntity.getId()); purReceiveEntity = receiveService.selectById(purReceiveEntity.getId());
List<PurReceiveDetailEntity> purReceiveDetailEntityList = receivedetailService.selectByOrderId(purReceiveEntity.getBillNo()); List<PurReceiveDetailEntity> purReceiveDetailEntityList = receivedetailService.selectByOrderId(purReceiveEntity.getBillNo());
BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_HCLY); BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_HCLY);
PurApplyEntity purApplyEntity = new PurApplyEntity();
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purApplyEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd")));
purApplyEntity.setBillDate(purReceiveEntity.getBillDate());
purApplyEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());
purApplyEntity.setRemark(purReceiveEntity.getRemark());
purApplyEntity.setInvCode(purReceiveEntity.getTargetInvCode());
purApplyEntity.setDeptCode(purReceiveEntity.getTargetDeptCode());
purApplyEntity.setTargetInvCode(purReceiveEntity.getInvCode());
purApplyEntity.setTargetDeptCode(purReceiveEntity.getDeptCode());
purApplyEntity.setCreateUser(purReceiveEntity.getAuditUser());
purApplyEntity.setCreateTime(DateUtil.timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
purApplyEntity.setUpdateUser(purReceiveEntity.getAuditUser());
purApplyEntity.setUpdateTime(DateUtil.timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
if (purApplyEntity.getStatus() == 3) {
purApplyEntity.setAuditUser("");
purApplyEntity.setAuditTime(new Date());
}
//插入申购主表
purApplyService.insert(purApplyEntity);
//用stream流复制list
List<PurApplyDetailEntity> purApplyDetailEntityList = purReceiveDetailEntityList.stream().map(e -> {
PurApplyDetailEntity d = new PurApplyDetailEntity();
d.setOrderIdFk(purApplyEntity.getId() + "");
d.setProductId(e.getRelIdFk().intValue());
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(e.getNameCode());
d.setProductName(udiProductEntity.getCpmctymc());
d.setCount(e.getCount());
d.setSupId(e.getSupId());
d.setZczbhhzbapzbh(udiProductEntity.getZczbhhzbapzbh());
return d;
})
.collect(Collectors.toList());
purApplyDetailService.insertPurApplyDetailEntity(purApplyDetailEntityList);
//todo 领用单暂时不支持流转
// PurApplyEntity purApplyEntity = new PurApplyEntity();
// if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
// purApplyEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd")));
// purApplyEntity.setBillDate(purReceiveEntity.getBillDate());
// purApplyEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());
// purApplyEntity.setRemark(purReceiveEntity.getRemark());
// purApplyEntity.setInvCode(purReceiveEntity.getTargetInvCode());
// purApplyEntity.setDeptCode(purReceiveEntity.getTargetDeptCode());
// purApplyEntity.setTargetInvCode(purReceiveEntity.getInvCode());
// purApplyEntity.setTargetDeptCode(purReceiveEntity.getDeptCode());
// purApplyEntity.setCreateUser(purReceiveEntity.getAuditUser());
// purApplyEntity.setCreateTime(DateUtil.timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
// purApplyEntity.setUpdateUser(purReceiveEntity.getAuditUser());
// purApplyEntity.setUpdateTime(DateUtil.timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
// if (purApplyEntity.getStatus() == 3) {
// purApplyEntity.setAuditUser("");
// purApplyEntity.setAuditTime(new Date());
// }
// //插入申购主表
// purApplyService.insert(purApplyEntity);
// //用stream流复制list
// List<PurApplyDetailEntity> purApplyDetailEntityList = purReceiveDetailEntityList.stream().map(e -> {
// PurApplyDetailEntity d = new PurApplyDetailEntity();
// d.setOrderIdFk(purApplyEntity.getId() + "");
// d.setProductId(e.getRelIdFk().intValue());
// UdiProductEntity udiProductEntity = udiProductService.findByNameCode(e.getNameCode());
// d.setProductName(udiProductEntity.getCpmctymc());
// d.setCount(e.getCount());
// d.setSupId(e.getSupId());
// d.setZczbhhzbapzbh(udiProductEntity.getZczbhhzbapzbh());
// return d;
// })
// .collect(Collectors.toList());
// purApplyDetailService.insertPurApplyDetailEntity(purApplyDetailEntityList);
//
// }
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purReceiveGen(purReceiveEntity);
} }
} }
//申购单流转 //申购单流转
@ -151,6 +156,10 @@ public class IoPurChangeService {
return d; return d;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
purPlanDetailService.insertPurPlanDetailEntity(purPlanDetailEntityList); purPlanDetailService.insertPurPlanDetailEntity(purPlanDetailEntityList);
purPlanChange(purPlanEntity);
//更新申购表信息插入计划单号 //更新申购表信息插入计划单号
PurApplyEntity purApplyEntity1 = new PurApplyEntity(); PurApplyEntity purApplyEntity1 = new PurApplyEntity();
purApplyEntity1.setId(purApplyEntity.getId()); purApplyEntity1.setId(purApplyEntity.getId());
@ -158,6 +167,11 @@ public class IoPurChangeService {
purApplyEntity1.setGeneratePlan(true); purApplyEntity1.setGeneratePlan(true);
purApplyService.update(purApplyEntity1); purApplyService.update(purApplyEntity1);
} }
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purApplyGen(purApplyEntity);
}
} }
} }
@ -165,12 +179,13 @@ public class IoPurChangeService {
//采购计划流转 //采购计划流转
public void purPlanChange(PurPlanEntity purPlanEntity) { public void purPlanChange(PurPlanEntity purPlanEntity) {
BasicBusTypeChangeEntity basicBusTypeChangeEntity = new BasicBusTypeChangeEntity(); BasicBusTypeChangeEntity basicBusTypeChangeEntity;
//查询计划详情
List<PurPlanDetailEntity> purPlanDetailEntityList = purPlanDetailService.findByOrderId(purPlanEntity.getId() + "");
//---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\ //---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\
PurOrderEntity purOrderEntity = new PurOrderEntity(); PurOrderEntity purOrderEntity = new PurOrderEntity();
if (purPlanEntity.getStatus() == 3) { if (purPlanEntity.getStatus() == 3) {
//查询计划详情
List<PurPlanDetailEntity> purPlanDetailEntityList = purPlanDetailService.findByOrderId(purPlanEntity.getId() + "");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH"); basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd"))); purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
@ -210,6 +225,9 @@ public class IoPurChangeService {
// purPlanEntity.sets(true); // purPlanEntity.sets(true);
purPlanService.update(purPlanEntity1); purPlanService.update(purPlanEntity1);
} }
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purPlanGen(purPlanEntity);
}
} }
} }
@ -219,6 +237,10 @@ public class IoPurChangeService {
public void purOrderChange(PurOrderEntity purOrderEntity) { public void purOrderChange(PurOrderEntity purOrderEntity) {
//最后一层，无法流转业务单 //最后一层，无法流转业务单
BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGDD);
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purOrderGen(purOrderEntity);
}
} }

92
src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
Unescape Escape View File

@ -63,8 +63,6 @@ public class PurApplyController {
@Resource @Resource
PurPlanDetailService purPlanDetailService; PurPlanDetailService purPlanDetailService;
@Resource
UdiProductService udiProductService;
@Resource @Resource
IBasicBusTypeChangeService basicBusTypeChangeService; IBasicBusTypeChangeService basicBusTypeChangeService;
@Resource @Resource
@ -79,6 +77,9 @@ public class PurApplyController {
IoOrderService ioOrderService; IoOrderService ioOrderService;
@Resource @Resource
IoOrderDetailBizService ioOrderDetailBizService; IoOrderDetailBizService ioOrderDetailBizService;
@Resource
IoPurChangeService purChangeService;
/** /**
* 新增申购单 * 新增申购单
*/ */
@ -93,7 +94,7 @@ public class PurApplyController {
purApplyEntity.setCreateTime(new Date()); purApplyEntity.setCreateTime(new Date());
purApplyEntity.setUpdateTime(new Date()); purApplyEntity.setUpdateTime(new Date());
purApplyEntity.setStatus(postPurApplyRequest.getEditStatus()); //草稿状态 purApplyEntity.setStatus(postPurApplyRequest.getEditStatus()); //草稿状态
if(postPurApplyRequest.getType()!=null){ if (postPurApplyRequest.getType() != null) {
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd")); String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd"));
purApplyEntity.setBillNo(billNo); purApplyEntity.setBillNo(billNo);
} }
@ -165,8 +166,9 @@ public class PurApplyController {
purApplyEntity.setAuditUser(userId + ""); purApplyEntity.setAuditUser(userId + "");
purApplyService.update(purApplyEntity); purApplyService.update(purApplyEntity);
if(purApplyRequest.getStatus()==3){ if (purApplyRequest.getStatus() == 3) {
generateDocument(purApplyEntity); // generateDocument(purApplyEntity);
purChangeService.purApplyChange(purApplyEntity);
} }
@ -208,18 +210,17 @@ public class PurApplyController {
} }
//根据单据生成新单据 //根据单据生成新单据
public Boolean generateDocument(PurApplyEntity purApplyEntity){ public Boolean generateDocument(PurApplyEntity purApplyEntity) {
BasicBusTypeChangeEntity basicBusTypeChangeEntity=new BasicBusTypeChangeEntity(); BasicBusTypeChangeEntity basicBusTypeChangeEntity = new BasicBusTypeChangeEntity();
//查询申购详情 //查询申购详情
List<PurApplyDetailEntity> purApplyDetailEntityList=purApplyDetailService.findByOrderId(purApplyEntity.getId()+""); List<PurApplyDetailEntity> purApplyDetailEntityList = purApplyDetailService.findByOrderId(purApplyEntity.getId() + "");
//---------------------------------判断申购为已审核就生成计划单-------------------------------------------// //---------------------------------判断申购为已审核就生成计划单-------------------------------------------//
PurPlanEntity purPlanEntity=new PurPlanEntity(); PurPlanEntity purPlanEntity = new PurPlanEntity();
List<PurPlanDetailEntity> purPlanDetailEntityList=new ArrayList<>(); List<PurPlanDetailEntity> purPlanDetailEntityList = new ArrayList<>();
if(purApplyEntity.getStatus()==3){ if (purApplyEntity.getStatus() == 3) {
basicBusTypeChangeEntity=basicBusTypeChangeService.selectByOriginAction("CPSG"); basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CPSG");
if(basicBusTypeChangeEntity!=null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable()==true){ if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purPlanEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd"))); purPlanEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd")));
purPlanEntity.setBillDate(purApplyEntity.getBillDate()); purPlanEntity.setBillDate(purApplyEntity.getBillDate());
purPlanEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus()); purPlanEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());
@ -229,10 +230,10 @@ public class PurApplyController {
purPlanEntity.setInvCode(purApplyEntity.getInvCode()); purPlanEntity.setInvCode(purApplyEntity.getInvCode());
purPlanEntity.setDeptCode(purApplyEntity.getDeptCode()); purPlanEntity.setDeptCode(purApplyEntity.getDeptCode());
purPlanEntity.setCreateUser(purApplyEntity.getAuditUser()); purPlanEntity.setCreateUser(purApplyEntity.getAuditUser());
purPlanEntity.setCreateTime(timeProcess(purApplyEntity.getCreateTime(),basicBusTypeChangeEntity.getBusBeforeTime())); purPlanEntity.setCreateTime(timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
purPlanEntity.setUpdateUser(purApplyEntity.getAuditUser()); purPlanEntity.setUpdateUser(purApplyEntity.getAuditUser());
purPlanEntity.setUpdateTime(timeProcess(purApplyEntity.getCreateTime(),basicBusTypeChangeEntity.getBusBeforeTime())); purPlanEntity.setUpdateTime(timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
if(purPlanEntity.getStatus()==3){ if (purPlanEntity.getStatus() == 3) {
purPlanEntity.setAuditUser(""); purPlanEntity.setAuditUser("");
purPlanEntity.setAuditTime(new Date()); purPlanEntity.setAuditTime(new Date());
} }
@ -241,7 +242,7 @@ public class PurApplyController {
//用stream流复制list //用stream流复制list
purPlanDetailEntityList = purApplyDetailEntityList.stream().map(e -> { purPlanDetailEntityList = purApplyDetailEntityList.stream().map(e -> {
PurPlanDetailEntity d = new PurPlanDetailEntity(); PurPlanDetailEntity d = new PurPlanDetailEntity();
d.setOrderIdFk(purPlanEntity.getId()+""); d.setOrderIdFk(purPlanEntity.getId() + "");
d.setProductId(e.getProductId()); d.setProductId(e.getProductId());
d.setProductName(e.getProductName()); d.setProductName(e.getProductName());
d.setCount(e.getCount()); d.setCount(e.getCount());
@ -251,16 +252,16 @@ public class PurApplyController {
}).collect(Collectors.toList()); }).collect(Collectors.toList());
purPlanDetailService.insertPurPlanDetailEntity(purPlanDetailEntityList); purPlanDetailService.insertPurPlanDetailEntity(purPlanDetailEntityList);
//更新申购表信息插入计划单号 //更新申购表信息插入计划单号
PurApplyEntity purApplyEntity1=new PurApplyEntity(); PurApplyEntity purApplyEntity1 = new PurApplyEntity();
purApplyEntity1.setId(purApplyEntity.getId()); purApplyEntity1.setId(purApplyEntity.getId());
purApplyEntity1.setPlanBillNo(purPlanEntity.getBillNo()); purApplyEntity1.setPlanBillNo(purPlanEntity.getBillNo());
purApplyEntity1.setGeneratePlan(true); purApplyEntity1.setGeneratePlan(true);
purApplyService.update(purApplyEntity1); purApplyService.update(purApplyEntity1);
//---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\ //---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\
PurOrderEntity purOrderEntity=new PurOrderEntity(); PurOrderEntity purOrderEntity = new PurOrderEntity();
if(purPlanEntity.getStatus()==3){ if (purPlanEntity.getStatus() == 3) {
basicBusTypeChangeEntity=basicBusTypeChangeService.selectByOriginAction("CGJH"); basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
if(basicBusTypeChangeEntity!=null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable()==true){ if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd"))); purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
purOrderEntity.setBillDate(purApplyEntity.getBillDate()); purOrderEntity.setBillDate(purApplyEntity.getBillDate());
purOrderEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus()); purOrderEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());
@ -270,10 +271,10 @@ public class PurApplyController {
purOrderEntity.setInvCode(purApplyEntity.getInvCode()); purOrderEntity.setInvCode(purApplyEntity.getInvCode());
purOrderEntity.setDeptCode(purApplyEntity.getDeptCode()); purOrderEntity.setDeptCode(purApplyEntity.getDeptCode());
purOrderEntity.setCreateUser(purApplyEntity.getAuditUser()); purOrderEntity.setCreateUser(purApplyEntity.getAuditUser());
purOrderEntity.setCreateTime(timeProcess(purApplyEntity.getCreateTime(),basicBusTypeChangeEntity.getBusBeforeTime())); purOrderEntity.setCreateTime(timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
purOrderEntity.setUpdateUser(purApplyEntity.getAuditUser()); purOrderEntity.setUpdateUser(purApplyEntity.getAuditUser());
purOrderEntity.setUpdateTime(timeProcess(purApplyEntity.getCreateTime(),basicBusTypeChangeEntity.getBusBeforeTime())); purOrderEntity.setUpdateTime(timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
if(purOrderEntity.getStatus()==3){ if (purOrderEntity.getStatus() == 3) {
purOrderEntity.setAuditUser(""); purOrderEntity.setAuditUser("");
purOrderEntity.setAuditTime(new Date()); purOrderEntity.setAuditTime(new Date());
} }
@ -282,7 +283,7 @@ public class PurApplyController {
//用stream流复制list //用stream流复制list
List<PurOrderDetailEntity> purOrderDetailEntityList = purApplyDetailEntityList.stream().map(e -> { List<PurOrderDetailEntity> purOrderDetailEntityList = purApplyDetailEntityList.stream().map(e -> {
PurOrderDetailEntity d = new PurOrderDetailEntity(); PurOrderDetailEntity d = new PurOrderDetailEntity();
d.setOrderIdFk(purOrderEntity.getId()+""); d.setOrderIdFk(purOrderEntity.getId() + "");
d.setProductId(e.getProductId()); d.setProductId(e.getProductId());
d.setProductName(e.getProductName()); d.setProductName(e.getProductName());
d.setCount(e.getCount()); d.setCount(e.getCount());
@ -292,7 +293,7 @@ public class PurApplyController {
}).collect(Collectors.toList()); }).collect(Collectors.toList());
purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailEntityList); purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailEntityList);
// 更新计划表信息插入订单单号 // 更新计划表信息插入订单单号
PurPlanEntity purPlanEntity1=new PurPlanEntity(); PurPlanEntity purPlanEntity1 = new PurPlanEntity();
purPlanEntity1.setId(purPlanEntity.getId()); purPlanEntity1.setId(purPlanEntity.getId());
purPlanEntity1.setStockOrderNo(purOrderEntity.getBillNo()); purPlanEntity1.setStockOrderNo(purOrderEntity.getBillNo());
// purPlanEntity.sets(true); // purPlanEntity.sets(true);
@ -300,15 +301,15 @@ public class PurApplyController {
} }
//---------------------------------判断计划为已审核就生成采购入库单-------------------------------------------//\ //---------------------------------判断计划为已审核就生成采购入库单-------------------------------------------//\
//查询申购单详情 //查询申购单详情
List<PurPlanDetailEntity> purPlanDetailEntities=purPlanDetailService.findByOrderId(purPlanEntity.getId()+""); List<PurPlanDetailEntity> purPlanDetailEntities = purPlanDetailService.findByOrderId(purPlanEntity.getId() + "");
//对计划单里面的供应商进行分组 //对计划单里面的供应商进行分组
Map<String, List<PurPlanDetailEntity>> map = purPlanDetailEntities.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId)); Map<String, List<PurPlanDetailEntity>> map = purPlanDetailEntities.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));
String billNo=""; String billNo = "";
if(basicBusTypeChangeEntity!=null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetAction()) && basicBusTypeChangeEntity.isEnable()==true){ if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetAction()) && basicBusTypeChangeEntity.isEnable() == true) {
for (Map.Entry<String, List<PurPlanDetailEntity>> m:map.entrySet()) { for (Map.Entry<String, List<PurPlanDetailEntity>> m : map.entrySet()) {
//生产单据表信息 //生产单据表信息
IoOrderEntity ioOrderEntity=new IoOrderEntity(); IoOrderEntity ioOrderEntity = new IoOrderEntity();
ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER ,"yyyyMMdd"))); ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")));
ioOrderEntity.setCorpOrderId(CustomUtil.getDate()); ioOrderEntity.setCorpOrderId(CustomUtil.getDate());
ioOrderEntity.setMainAction(ConstantType.TYPE_PUT); ioOrderEntity.setMainAction(ConstantType.TYPE_PUT);
ioOrderEntity.setAction(basicBusTypeChangeEntity.getTargetAction()); ioOrderEntity.setAction(basicBusTypeChangeEntity.getTargetAction());
@ -325,9 +326,9 @@ public class PurApplyController {
ioOrderEntity.setDeptCode(purApplyEntity.getInvCode()); ioOrderEntity.setDeptCode(purApplyEntity.getInvCode());
ioOrderEntity.setInvCode(purApplyEntity.getDeptCode()); ioOrderEntity.setInvCode(purApplyEntity.getDeptCode());
ioOrderService.insertOrder(ioOrderEntity); ioOrderService.insertOrder(ioOrderEntity);
billNo+=ioOrderEntity.getBillNo()+","; billNo += ioOrderEntity.getBillNo() + ",";
//插入业务单表 //插入业务单表
for (PurPlanDetailEntity obj:m.getValue()) { for (PurPlanDetailEntity obj : m.getValue()) {
BasicProductsEntity basicProductsEntity = purPlanDetailService.selectIoOrderDetailBiz(obj.getId()); BasicProductsEntity basicProductsEntity = purPlanDetailService.selectIoOrderDetailBiz(obj.getId());
IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo()); ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo());
@ -348,9 +349,9 @@ public class PurApplyController {
ioOrderDetailBizService.insert(ioOrderDetailBizEntity); ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
} }
} }
PurPlanEntity purPlanEntity1=new PurPlanEntity(); PurPlanEntity purPlanEntity1 = new PurPlanEntity();
purPlanEntity1.setId(purPlanEntity.getId()); purPlanEntity1.setId(purPlanEntity.getId());
purPlanEntity1.setStockOrderNo(billNo.substring(0,billNo.length()-1)); purPlanEntity1.setStockOrderNo(billNo.substring(0, billNo.length() - 1));
purPlanService.update(purPlanEntity1); purPlanService.update(purPlanEntity1);
} }
@ -362,10 +363,10 @@ public class PurApplyController {
return true; return true;
} }
public Date timeProcess(Date date,Integer timeCount) { public Date timeProcess(Date date, Integer timeCount) {
Calendar rightNow = Calendar.getInstance(); Calendar rightNow = Calendar.getInstance();
rightNow.setTime(date); rightNow.setTime(date);
rightNow.add(Calendar.HOUR,timeCount); rightNow.add(Calendar.HOUR, timeCount);
Date dt1 = rightNow.getTime(); Date dt1 = rightNow.getTime();
return dt1; return dt1;
} }
@ -473,6 +474,7 @@ public class PurApplyController {
purApplyDetailService.insert(purApplyDetailEntity); purApplyDetailService.insert(purApplyDetailEntity);
return ResultVOUtils.success(purApplyDetailEntity.getOrderIdFk()); return ResultVOUtils.success(purApplyDetailEntity.getOrderIdFk());
} }
/** /**
* 新增申购单 * 新增申购单
*/ */
@ -487,7 +489,7 @@ public class PurApplyController {
purApplyEntity.setUpdateTime(new Date()); purApplyEntity.setUpdateTime(new Date());
purApplyEntity.setUpdateUser(userId + ""); purApplyEntity.setUpdateUser(userId + "");
purApplyService.insert(purApplyEntity); purApplyService.insert(purApplyEntity);
Long id=purApplyEntity.getId(); Long id = purApplyEntity.getId();
return ResultVOUtils.success(id); return ResultVOUtils.success(id);
} }
@ -499,11 +501,11 @@ public class PurApplyController {
@PostMapping("/purchase/apply/delApplyDetailAll") @PostMapping("/purchase/apply/delApplyDetailAll")
public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) {
if(purApplyEntity.getId()!=null){ if (purApplyEntity.getId() != null) {
purApplyService.deleteById(purApplyEntity.getId()); purApplyService.deleteById(purApplyEntity.getId());
purApplyDetailService.deleteByOrderId(purApplyEntity.getId() + "" ); purApplyDetailService.deleteByOrderId(purApplyEntity.getId() + "");
}else { } else {
return ResultVOUtils.error(999,"参数有误！"); return ResultVOUtils.error(999, "参数有误！");
} }
return ResultVOUtils.success(); return ResultVOUtils.success();
} }

180
src/main/java/com/glxp/api/controller/purchase/PurOrderController.java
Unescape Escape View File

@ -66,7 +66,8 @@ public class PurOrderController {
IoOrderService ioOrderService; IoOrderService ioOrderService;
@Resource @Resource
IoOrderDetailBizService ioOrderDetailBizService; IoOrderDetailBizService ioOrderDetailBizService;
@Resource
IoPurChangeService purChangeService;
/** /**
* 新增采购计划 * 新增采购计划
@ -85,7 +86,7 @@ public class PurOrderController {
purOrderEntity.setUpdateUser(userId + ""); purOrderEntity.setUpdateUser(userId + "");
purOrderEntity.setStatus(postPurOrderRequest.getEditStatus()); //草稿状态 purOrderEntity.setStatus(postPurOrderRequest.getEditStatus()); //草稿状态
if(postPurOrderRequest.getType()!=null){ if (postPurOrderRequest.getType() != null) {
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd")); String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd"));
purOrderEntity.setBillNo(billNo); purOrderEntity.setBillNo(billNo);
} }
@ -150,69 +151,73 @@ public class PurOrderController {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity(); PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity();
purOrderEntity.setUpdateTime(new Date()); purOrderEntity.setUpdateTime(new Date());
purOrderEntity.setUpdateUser(userId+""); purOrderEntity.setUpdateUser(userId + "");
purOrderEntity.setAuditUser(userId + ""); purOrderEntity.setAuditUser(userId + "");
purOrderEntity.setAuditTime(new Date()); purOrderEntity.setAuditTime(new Date());
purOrderEntity.setStatus(postPurOrderRequest.getEditStatus()); purOrderEntity.setStatus(postPurOrderRequest.getEditStatus());
purOrderService.update(purOrderEntity); purOrderService.update(purOrderEntity);
String billNo="";
List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getId() + "");
purChangeService.purOrderChange(purOrderEntity);
//对计划单里面的供应商进行分组
Map<String, List<PurOrderDetailEntity>> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId)); // String billNo = "";
// List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getId() + "");
if (postPurOrderRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) { //
// //对计划单里面的供应商进行分组
if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurOrderRequest.isAutoPurchase()==true // Map<String, List<PurOrderDetailEntity>> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId));
&& StrUtil.isNotEmpty(postPurOrderRequest.getTargetSubInv()) && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction()) ) { //
// if (postPurOrderRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) {
for (Map.Entry<String, List<PurOrderDetailEntity>> m:map.entrySet()) { //
//生产单据表信息 // if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurOrderRequest.isAutoPurchase() == true
IoOrderEntity ioOrderEntity=new IoOrderEntity(); // && StrUtil.isNotEmpty(postPurOrderRequest.getTargetSubInv()) && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())) {
ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER ,"yyyyMMdd"))); //
ioOrderEntity.setCorpOrderId(CustomUtil.getDate()); // for (Map.Entry<String, List<PurOrderDetailEntity>> m : map.entrySet()) {
ioOrderEntity.setMainAction(ConstantType.TYPE_PUT); // //生产单据表信息
ioOrderEntity.setAction(postPurOrderRequest.getTargetBillAction()); // IoOrderEntity ioOrderEntity = new IoOrderEntity();
ioOrderEntity.setFromCorp(m.getKey()); // ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")));
ioOrderEntity.setFromType(ConstantStatus.FROM_Order); // ioOrderEntity.setCorpOrderId(CustomUtil.getDate());
ioOrderEntity.setStatus(1); // ioOrderEntity.setMainAction(ConstantType.TYPE_PUT);
ioOrderEntity.setDealStatus(1); // ioOrderEntity.setAction(postPurOrderRequest.getTargetBillAction());
ioOrderEntity.setOrderType(1); // ioOrderEntity.setFromCorp(m.getKey());
ioOrderEntity.setCreateTime(new Date()); // ioOrderEntity.setFromType(ConstantStatus.FROM_Order);
ioOrderEntity.setCreateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser()); // ioOrderEntity.setStatus(1);
ioOrderEntity.setUpdateTime(new Date()); // ioOrderEntity.setDealStatus(1);
ioOrderEntity.setUpdateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser()); // ioOrderEntity.setOrderType(1);
ioOrderEntity.setCustomerId("110"); // ioOrderEntity.setCreateTime(new Date());
ioOrderEntity.setDeptCode(postPurOrderRequest.getTargetDeptCode()); // ioOrderEntity.setCreateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser());
ioOrderEntity.setInvCode(postPurOrderRequest.getTargetSubInv()); // ioOrderEntity.setUpdateTime(new Date());
ioOrderService.insertOrder(ioOrderEntity); // ioOrderEntity.setUpdateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser());
billNo+=ioOrderEntity.getBillNo()+","; // ioOrderEntity.setCustomerId("110");
//插入业务单表 // ioOrderEntity.setDeptCode(postPurOrderRequest.getTargetDeptCode());
for (PurOrderDetailEntity obj:m.getValue()) { // ioOrderEntity.setInvCode(postPurOrderRequest.getTargetSubInv());
BasicProductsEntity basicProductsEntity = purOrderDetailService.selectIoOrderDetailBiz(obj.getId()); // ioOrderService.insertOrder(ioOrderEntity);
IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); // billNo += ioOrderEntity.getBillNo() + ",";
ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo()); // //插入业务单表
ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId())); // for (PurOrderDetailEntity obj : m.getValue()) {
ioOrderDetailBizEntity.setCount(obj.getCount()); // BasicProductsEntity basicProductsEntity = purOrderDetailService.selectIoOrderDetailBiz(obj.getId());
ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid()); // IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode()); // ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo());
ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc()); // ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId()));
ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh()); // ioOrderDetailBizEntity.setCount(obj.getCount());
ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc()); // ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid());
ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory()); // ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode());
ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname()); // ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc());
ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh()); // ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh());
if (basicProductsEntity.getPrice() != null) { // ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc());
ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice())); // ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory());
} // ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
ioOrderDetailBizEntity.setSupId(obj.getSupId()); // ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
ioOrderDetailBizService.insert(ioOrderDetailBizEntity); // if (basicProductsEntity.getPrice() != null) {
} // ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice()));
} // }
purOrderEntity.setStockOrderNo(billNo.substring(0,billNo.length()-1)); // ioOrderDetailBizEntity.setSupId(obj.getSupId());
purOrderService.update(purOrderEntity); // ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
} // }
} // }
// purOrderEntity.setStockOrderNo(billNo.substring(0, billNo.length() - 1));
// purOrderService.update(purOrderEntity);
// }
// }
return ResultVOUtils.success("更新成功！"); return ResultVOUtils.success("更新成功！");
} }
@ -240,35 +245,35 @@ public class PurOrderController {
public BaseResponse addPlanDetailAndOrder(@RequestBody PurOrderRequest purOrderRequest) { public BaseResponse addPlanDetailAndOrder(@RequestBody PurOrderRequest purOrderRequest) {
if (purOrderRequest.getApplyId() == null || purOrderRequest.getId() == null) { if (purOrderRequest.getApplyId() == null || purOrderRequest.getId() == null) {
return ResultVOUtils.error(999,"参数错误！"); return ResultVOUtils.error(999, "参数错误！");
} }
//查询申购单详情 //查询申购单详情
PurPlanDetailRequest purPlanDetailRequest=new PurPlanDetailRequest(); PurPlanDetailRequest purPlanDetailRequest = new PurPlanDetailRequest();
purPlanDetailRequest.setOrderIdFk(purOrderRequest.getApplyId()+""); purPlanDetailRequest.setOrderIdFk(purOrderRequest.getApplyId() + "");
List<PurPlanDetailEntity> purApplyDetailEntityList=purPlanDetailService.getPurPlanDetailEntityList(purPlanDetailRequest); List<PurPlanDetailEntity> purApplyDetailEntityList = purPlanDetailService.getPurPlanDetailEntityList(purPlanDetailRequest);
//使用stream拷贝list //使用stream拷贝list
List<PurOrderDetailEntity> purOrderDetailEntityList = purApplyDetailEntityList.stream() List<PurOrderDetailEntity> purOrderDetailEntityList = purApplyDetailEntityList.stream()
.map(e-> { .map(e -> {
PurOrderDetailEntity d = new PurOrderDetailEntity(); PurOrderDetailEntity d = new PurOrderDetailEntity();
BeanUtils.copyProperties(e, d); BeanUtils.copyProperties(e, d);
return d; return d;
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
for (PurOrderDetailEntity obj:purOrderDetailEntityList){ for (PurOrderDetailEntity obj : purOrderDetailEntityList) {
obj.setOrderIdFk(purOrderRequest.getId()+""); obj.setOrderIdFk(purOrderRequest.getId() + "");
} }
//获取详情表信息 //获取详情表信息
PurOrderDetailRequest PurOrderDetailRequest=new PurOrderDetailRequest(); PurOrderDetailRequest PurOrderDetailRequest = new PurOrderDetailRequest();
PurOrderDetailRequest.setOrderIdFk(purOrderRequest.getId() + ""); PurOrderDetailRequest.setOrderIdFk(purOrderRequest.getId() + "");
List<PurOrderDetailEntity> purOrderDetailEntities=purOrderDetailService.getPurOrderDetailEntityList(PurOrderDetailRequest); List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.getPurOrderDetailEntityList(PurOrderDetailRequest);
List<Long> ids=new ArrayList<>(); List<Long> ids = new ArrayList<>();
for (PurOrderDetailEntity obj:purOrderDetailEntities){ for (PurOrderDetailEntity obj : purOrderDetailEntities) {
for (PurOrderDetailEntity obj1:purOrderDetailEntityList){ for (PurOrderDetailEntity obj1 : purOrderDetailEntityList) {
if(obj.getProductId().equals(obj1.getProductId())){ if (obj.getProductId().equals(obj1.getProductId())) {
//获取存在在详情表和申购单里面一样的产品 //获取存在在详情表和申购单里面一样的产品
ids.add(obj.getId().longValue()); ids.add(obj.getId().longValue());
break; break;
@ -276,16 +281,16 @@ public class PurOrderController {
} }
} }
//删除存在的产品 //删除存在的产品
if(ids.size()>0){ if (ids.size() > 0) {
purOrderDetailService.deleteByIds(ids); purOrderDetailService.deleteByIds(ids);
} }
boolean falg= purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailEntityList); boolean falg = purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailEntityList);
if(falg){ if (falg) {
//查询申购单 //查询申购单
return ResultVOUtils.success("添加成功"); return ResultVOUtils.success("添加成功");
}else{ } else {
return ResultVOUtils.success("添加失败"); return ResultVOUtils.success("添加失败");
} }
} }
@ -297,10 +302,10 @@ public class PurOrderController {
@PostMapping("/purchase/order/addOrderDetail") @PostMapping("/purchase/order/addOrderDetail")
public BaseResponse addOrderDetail(@RequestBody PurOrderDetailEntity purOrderDetailEntity) { public BaseResponse addOrderDetail(@RequestBody PurOrderDetailEntity purOrderDetailEntity) {
boolean falg=purOrderDetailService.insert(purOrderDetailEntity); boolean falg = purOrderDetailService.insert(purOrderDetailEntity);
if(falg){ if (falg) {
return ResultVOUtils.success("添加成功"); return ResultVOUtils.success("添加成功");
}else { } else {
return ResultVOUtils.success("添加失败"); return ResultVOUtils.success("添加失败");
} }
@ -314,13 +319,13 @@ public class PurOrderController {
@PostMapping("/purchase/order/add") @PostMapping("/purchase/order/add")
public BaseResponse add() { public BaseResponse add() {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
PurOrderEntity purOrderEntity= new PurOrderEntity(); PurOrderEntity purOrderEntity = new PurOrderEntity();
purOrderEntity.setCreateUser(userId + ""); purOrderEntity.setCreateUser(userId + "");
purOrderEntity.setCreateTime(new Date()); purOrderEntity.setCreateTime(new Date());
purOrderEntity.setUpdateTime(new Date()); purOrderEntity.setUpdateTime(new Date());
purOrderEntity.setUpdateUser(userId + ""); purOrderEntity.setUpdateUser(userId + "");
purOrderService.insert(purOrderEntity); purOrderService.insert(purOrderEntity);
Long id=purOrderEntity.getId(); Long id = purOrderEntity.getId();
return ResultVOUtils.success(id); return ResultVOUtils.success(id);
} }
@ -331,11 +336,11 @@ public class PurOrderController {
@PostMapping("/purchase/order/delOrderDetailAll") @PostMapping("/purchase/order/delOrderDetailAll")
public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) {
if(purApplyEntity.getId()!=null){ if (purApplyEntity.getId() != null) {
purOrderService.deleteById(purApplyEntity.getId()); purOrderService.deleteById(purApplyEntity.getId());
purOrderDetailService.deleteByOrderId(purApplyEntity.getId() + "" ); purOrderDetailService.deleteByOrderId(purApplyEntity.getId() + "");
}else { } else {
return ResultVOUtils.error(999,"参数有误！"); return ResultVOUtils.error(999, "参数有误！");
} }
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
@ -349,6 +354,7 @@ public class PurOrderController {
purOrderDetailService.update(purOrderDetailEntity); purOrderDetailService.update(purOrderDetailEntity);
return ResultVOUtils.success("修改成功"); return ResultVOUtils.success("修改成功");
} }
/** /**
* 删除采购订单 * 删除采购订单
* *

7
src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java
Unescape Escape View File

@ -86,6 +86,8 @@ public class PurOrderReceiveController extends BaseController {
IoOrderService ioOrderService; IoOrderService ioOrderService;
@Resource @Resource
IoOrderDetailBizService ioOrderDetailBizService; IoOrderDetailBizService ioOrderDetailBizService;
@Resource
IoPurChangeService purChangeService;
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@ -252,9 +254,10 @@ public class PurOrderReceiveController extends BaseController {
receiveService.updateOrder(purReceiveEntity); receiveService.updateOrder(purReceiveEntity);
if (purReceiveEntity.getStatus() == 3) { if (purReceiveEntity.getStatus() == 3) {
generateDocument(purReceiveEntity); //进行单据流转
purChangeService.purReceiveChange(purReceiveEntity);
// generateDocument(purReceiveEntity);
} }
return ResultVOUtils.success("成功"); return ResultVOUtils.success("成功");
} }

114
src/main/java/com/glxp/api/controller/purchase/PurPlanController.java
Unescape Escape View File

@ -80,7 +80,8 @@ public class PurPlanController {
PurOrderService purOrderService; PurOrderService purOrderService;
@Resource @Resource
PurOrderDetailService purOrderDetailService; PurOrderDetailService purOrderDetailService;
@Resource
IoPurChangeService purChangeService;
/** /**
* 新增采购计划 * 新增采购计划
@ -99,7 +100,7 @@ public class PurPlanController {
purPlanEntity.setUpdateUser(userId + ""); purPlanEntity.setUpdateUser(userId + "");
purPlanEntity.setStatus(postPurPlanRequest.getEditStatus()); //草稿状态 purPlanEntity.setStatus(postPurPlanRequest.getEditStatus()); //草稿状态
if(postPurPlanRequest.getType()!=null){ if (postPurPlanRequest.getType() != null) {
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd")); String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd"));
purPlanEntity.setBillNo(billNo); purPlanEntity.setBillNo(billNo);
} }
@ -111,7 +112,6 @@ public class PurPlanController {
} }
return ResultVOUtils.success("提交成功！"); return ResultVOUtils.success("提交成功！");
} }
@ -185,13 +185,14 @@ public class PurPlanController {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
PurPlanEntity purPlanEntity = postPurPlanRequest.getPurPlanEntity(); PurPlanEntity purPlanEntity = postPurPlanRequest.getPurPlanEntity();
purPlanEntity.setUpdateTime(new Date()); purPlanEntity.setUpdateTime(new Date());
purPlanEntity.setUpdateUser(userId+""); purPlanEntity.setUpdateUser(userId + "");
purPlanEntity.setAuditUser(userId + ""); purPlanEntity.setAuditUser(userId + "");
purPlanEntity.setAuditUser(userId + ""); purPlanEntity.setAuditUser(userId + "");
purPlanEntity.setStatus(postPurPlanRequest.getEditStatus()); purPlanEntity.setStatus(postPurPlanRequest.getEditStatus());
// purPlanService.update(purApplyEntity); // purPlanService.update(purApplyEntity);
if(purPlanEntity.getStatus()==3){ if (purPlanEntity.getStatus() == 3) {
generateDocument(purPlanEntity); purChangeService.purPlanChange(purPlanEntity);
// generateDocument(purPlanEntity);
} }
@ -257,15 +258,15 @@ public class PurPlanController {
} }
//根据单据生成新单据 //根据单据生成新单据
public Boolean generateDocument(PurPlanEntity purPlanEntity){ public Boolean generateDocument(PurPlanEntity purPlanEntity) {
BasicBusTypeChangeEntity basicBusTypeChangeEntity=new BasicBusTypeChangeEntity(); BasicBusTypeChangeEntity basicBusTypeChangeEntity = new BasicBusTypeChangeEntity();
//查询计划详情 //查询计划详情
List<PurPlanDetailEntity> purPlanDetailEntityList=purPlanDetailService.findByOrderId(purPlanEntity.getId()+""); List<PurPlanDetailEntity> purPlanDetailEntityList = purPlanDetailService.findByOrderId(purPlanEntity.getId() + "");
//---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\ //---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\
PurOrderEntity purOrderEntity=new PurOrderEntity(); PurOrderEntity purOrderEntity = new PurOrderEntity();
if(purPlanEntity.getStatus()==3){ if (purPlanEntity.getStatus() == 3) {
basicBusTypeChangeEntity=basicBusTypeChangeService.selectByOriginAction("CGJH"); basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
if(basicBusTypeChangeEntity!=null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable()==true){ if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd"))); purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
purOrderEntity.setBillDate(purPlanEntity.getBillDate()); purOrderEntity.setBillDate(purPlanEntity.getBillDate());
purOrderEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus()); purOrderEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());
@ -275,10 +276,10 @@ public class PurPlanController {
purOrderEntity.setInvCode(purPlanEntity.getInvCode()); purOrderEntity.setInvCode(purPlanEntity.getInvCode());
purOrderEntity.setDeptCode(purPlanEntity.getDeptCode()); purOrderEntity.setDeptCode(purPlanEntity.getDeptCode());
purOrderEntity.setCreateUser(purPlanEntity.getAuditUser()); purOrderEntity.setCreateUser(purPlanEntity.getAuditUser());
purOrderEntity.setCreateTime(timeProcess(purPlanEntity.getCreateTime(),basicBusTypeChangeEntity.getBusBeforeTime())); purOrderEntity.setCreateTime(timeProcess(purPlanEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
purOrderEntity.setUpdateUser(purPlanEntity.getAuditUser()); purOrderEntity.setUpdateUser(purPlanEntity.getAuditUser());
purOrderEntity.setUpdateTime(timeProcess(purPlanEntity.getCreateTime(),basicBusTypeChangeEntity.getBusBeforeTime())); purOrderEntity.setUpdateTime(timeProcess(purPlanEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
if(purOrderEntity.getStatus()==3){ if (purOrderEntity.getStatus() == 3) {
purOrderEntity.setAuditUser(""); purOrderEntity.setAuditUser("");
purOrderEntity.setAuditTime(new Date()); purOrderEntity.setAuditTime(new Date());
} }
@ -287,7 +288,7 @@ public class PurPlanController {
//用stream流复制list //用stream流复制list
List<PurOrderDetailEntity> purOrderDetailEntityList = purPlanDetailEntityList.stream().map(e -> { List<PurOrderDetailEntity> purOrderDetailEntityList = purPlanDetailEntityList.stream().map(e -> {
PurOrderDetailEntity d = new PurOrderDetailEntity(); PurOrderDetailEntity d = new PurOrderDetailEntity();
d.setOrderIdFk(purOrderEntity.getId()+""); d.setOrderIdFk(purOrderEntity.getId() + "");
d.setProductId(e.getProductId()); d.setProductId(e.getProductId());
d.setProductName(e.getProductName()); d.setProductName(e.getProductName());
d.setCount(e.getCount()); d.setCount(e.getCount());
@ -297,7 +298,7 @@ public class PurPlanController {
}).collect(Collectors.toList()); }).collect(Collectors.toList());
purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailEntityList); purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailEntityList);
// 更新计划表信息插入订单单号 // 更新计划表信息插入订单单号
PurPlanEntity purPlanEntity1=new PurPlanEntity(); PurPlanEntity purPlanEntity1 = new PurPlanEntity();
purPlanEntity1.setId(purPlanEntity.getId()); purPlanEntity1.setId(purPlanEntity.getId());
purPlanEntity1.setStockOrderNo(purOrderEntity.getBillNo()); purPlanEntity1.setStockOrderNo(purOrderEntity.getBillNo());
// purPlanEntity.sets(true); // purPlanEntity.sets(true);
@ -305,15 +306,15 @@ public class PurPlanController {
} }
//---------------------------------判断计划为已审核就生成采购入库单-------------------------------------------//\ //---------------------------------判断计划为已审核就生成采购入库单-------------------------------------------//\
//查询申购单详情 //查询申购单详情
List<PurPlanDetailEntity> purPlanDetailEntities=purPlanDetailService.findByOrderId(purPlanEntity.getId()+""); List<PurPlanDetailEntity> purPlanDetailEntities = purPlanDetailService.findByOrderId(purPlanEntity.getId() + "");
//对计划单里面的供应商进行分组 //对计划单里面的供应商进行分组
Map<String, List<PurPlanDetailEntity>> map = purPlanDetailEntities.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId)); Map<String, List<PurPlanDetailEntity>> map = purPlanDetailEntities.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));
String billNo=""; String billNo = "";
if(basicBusTypeChangeEntity!=null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetAction()) && basicBusTypeChangeEntity.isEnable()==true){ if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetAction()) && basicBusTypeChangeEntity.isEnable() == true) {
for (Map.Entry<String, List<PurPlanDetailEntity>> m:map.entrySet()) { for (Map.Entry<String, List<PurPlanDetailEntity>> m : map.entrySet()) {
//生产单据表信息 //生产单据表信息
IoOrderEntity ioOrderEntity=new IoOrderEntity(); IoOrderEntity ioOrderEntity = new IoOrderEntity();
ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER ,"yyyyMMdd"))); ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")));
ioOrderEntity.setCorpOrderId(CustomUtil.getDate()); ioOrderEntity.setCorpOrderId(CustomUtil.getDate());
ioOrderEntity.setMainAction(ConstantType.TYPE_PUT); ioOrderEntity.setMainAction(ConstantType.TYPE_PUT);
ioOrderEntity.setAction(basicBusTypeChangeEntity.getTargetAction()); ioOrderEntity.setAction(basicBusTypeChangeEntity.getTargetAction());
@ -330,9 +331,9 @@ public class PurPlanController {
ioOrderEntity.setDeptCode(purPlanEntity.getInvCode()); ioOrderEntity.setDeptCode(purPlanEntity.getInvCode());
ioOrderEntity.setInvCode(purPlanEntity.getDeptCode()); ioOrderEntity.setInvCode(purPlanEntity.getDeptCode());
ioOrderService.insertOrder(ioOrderEntity); ioOrderService.insertOrder(ioOrderEntity);
billNo+=ioOrderEntity.getBillNo()+","; billNo += ioOrderEntity.getBillNo() + ",";
//插入业务单表 //插入业务单表
for (PurPlanDetailEntity obj:m.getValue()) { for (PurPlanDetailEntity obj : m.getValue()) {
BasicProductsEntity basicProductsEntity = purPlanDetailService.selectIoOrderDetailBiz(obj.getId()); BasicProductsEntity basicProductsEntity = purPlanDetailService.selectIoOrderDetailBiz(obj.getId());
IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo()); ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo());
@ -353,19 +354,19 @@ public class PurPlanController {
ioOrderDetailBizService.insert(ioOrderDetailBizEntity); ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
} }
} }
PurPlanEntity purPlanEntity1=new PurPlanEntity(); PurPlanEntity purPlanEntity1 = new PurPlanEntity();
purPlanEntity1.setId(purPlanEntity.getId()); purPlanEntity1.setId(purPlanEntity.getId());
purPlanEntity1.setStockOrderNo(billNo.substring(0,billNo.length()-1)); purPlanEntity1.setStockOrderNo(billNo.substring(0, billNo.length() - 1));
purPlanService.update(purPlanEntity1); purPlanService.update(purPlanEntity1);
} }
} }
return true; return true;
} }
public Date timeProcess(Date date,Integer timeCount) { public Date timeProcess(Date date, Integer timeCount) {
Calendar rightNow = Calendar.getInstance(); Calendar rightNow = Calendar.getInstance();
rightNow.setTime(date); rightNow.setTime(date);
rightNow.add(Calendar.HOUR,timeCount); rightNow.add(Calendar.HOUR, timeCount);
Date dt1 = rightNow.getTime(); Date dt1 = rightNow.getTime();
return dt1; return dt1;
} }
@ -394,35 +395,35 @@ public class PurPlanController {
public BaseResponse addPlanDetailAndApply(@RequestBody PurPlanRequest purPlanRequest) { public BaseResponse addPlanDetailAndApply(@RequestBody PurPlanRequest purPlanRequest) {
if (purPlanRequest.getApplyId() == null || purPlanRequest.getId() == null) { if (purPlanRequest.getApplyId() == null || purPlanRequest.getId() == null) {
return ResultVOUtils.error(999,"参数错误！"); return ResultVOUtils.error(999, "参数错误！");
} }
//查询申购单详情 //查询申购单详情
PurApplyDetailRequest purApplyDetailRequest=new PurApplyDetailRequest(); PurApplyDetailRequest purApplyDetailRequest = new PurApplyDetailRequest();
purApplyDetailRequest.setOrderIdFk(purPlanRequest.getApplyId()+""); purApplyDetailRequest.setOrderIdFk(purPlanRequest.getApplyId() + "");
List<PurApplyDetailEntity> purApplyDetailEntityList=purApplyDetailService.selectPurApplyDetailList(purApplyDetailRequest); List<PurApplyDetailEntity> purApplyDetailEntityList = purApplyDetailService.selectPurApplyDetailList(purApplyDetailRequest);
//使用stream拷贝list //使用stream拷贝list
List<PurPlanDetailEntity> purPlanDetailEntityList = purApplyDetailEntityList.stream() List<PurPlanDetailEntity> purPlanDetailEntityList = purApplyDetailEntityList.stream()
.map(e-> { .map(e -> {
PurPlanDetailEntity d = new PurPlanDetailEntity(); PurPlanDetailEntity d = new PurPlanDetailEntity();
BeanUtils.copyProperties(e, d); BeanUtils.copyProperties(e, d);
return d; return d;
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
for (PurPlanDetailEntity obj:purPlanDetailEntityList){ for (PurPlanDetailEntity obj : purPlanDetailEntityList) {
obj.setOrderIdFk(purPlanRequest.getId()+""); obj.setOrderIdFk(purPlanRequest.getId() + "");
} }
//获取详情表信息 //获取详情表信息
PurPlanDetailRequest purPlanDetailRequest=new PurPlanDetailRequest(); PurPlanDetailRequest purPlanDetailRequest = new PurPlanDetailRequest();
purPlanDetailRequest.setOrderIdFk(purPlanRequest.getId() + ""); purPlanDetailRequest.setOrderIdFk(purPlanRequest.getId() + "");
List<PurPlanDetailEntity> purApplyDetailEntities=purPlanDetailService.getPurPlanDetailEntityList(purPlanDetailRequest); List<PurPlanDetailEntity> purApplyDetailEntities = purPlanDetailService.getPurPlanDetailEntityList(purPlanDetailRequest);
List<Long> ids=new ArrayList<>(); List<Long> ids = new ArrayList<>();
for (PurPlanDetailEntity obj:purApplyDetailEntities){ for (PurPlanDetailEntity obj : purApplyDetailEntities) {
for (PurPlanDetailEntity obj1:purPlanDetailEntityList){ for (PurPlanDetailEntity obj1 : purPlanDetailEntityList) {
if(obj.getProductId().equals(obj1.getProductId())){ if (obj.getProductId().equals(obj1.getProductId())) {
//获取存在在详情表和申购单里面一样的产品 //获取存在在详情表和申购单里面一样的产品
ids.add(obj.getId().longValue()); ids.add(obj.getId().longValue());
break; break;
@ -430,16 +431,16 @@ public class PurPlanController {
} }
} }
//删除存在的产品 //删除存在的产品
if(ids.size()>0){ if (ids.size() > 0) {
purPlanDetailService.deleteByIds(ids); purPlanDetailService.deleteByIds(ids);
} }
boolean falg= purPlanDetailService.insertPurPlanDetailEntity(purPlanDetailEntityList); boolean falg = purPlanDetailService.insertPurPlanDetailEntity(purPlanDetailEntityList);
if(falg){ if (falg) {
//查询申购单 //查询申购单
return ResultVOUtils.success("添加成功"); return ResultVOUtils.success("添加成功");
}else{ } else {
return ResultVOUtils.success("添加失败"); return ResultVOUtils.success("添加失败");
} }
} }
@ -451,10 +452,10 @@ public class PurPlanController {
@PostMapping("/purchase/plan/addPlanDetail") @PostMapping("/purchase/plan/addPlanDetail")
public BaseResponse addPlanDetail(@RequestBody PurPlanDetailEntity purPlanDetailEntity) { public BaseResponse addPlanDetail(@RequestBody PurPlanDetailEntity purPlanDetailEntity) {
boolean falg=purPlanDetailService.insert(purPlanDetailEntity); boolean falg = purPlanDetailService.insert(purPlanDetailEntity);
if(falg){ if (falg) {
return ResultVOUtils.success("添加成功"); return ResultVOUtils.success("添加成功");
}else { } else {
return ResultVOUtils.success("添加失败"); return ResultVOUtils.success("添加失败");
} }
@ -468,13 +469,13 @@ public class PurPlanController {
@PostMapping("/purchase/plan/add") @PostMapping("/purchase/plan/add")
public BaseResponse add() { public BaseResponse add() {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
PurPlanEntity purPlanEntity= new PurPlanEntity(); PurPlanEntity purPlanEntity = new PurPlanEntity();
purPlanEntity.setCreateUser(userId + ""); purPlanEntity.setCreateUser(userId + "");
purPlanEntity.setCreateTime(new Date()); purPlanEntity.setCreateTime(new Date());
purPlanEntity.setUpdateTime(new Date()); purPlanEntity.setUpdateTime(new Date());
purPlanEntity.setUpdateUser(userId + ""); purPlanEntity.setUpdateUser(userId + "");
purPlanService.insert(purPlanEntity); purPlanService.insert(purPlanEntity);
Long id=purPlanEntity.getId(); Long id = purPlanEntity.getId();
return ResultVOUtils.success(id); return ResultVOUtils.success(id);
} }
@ -485,11 +486,11 @@ public class PurPlanController {
@PostMapping("/purchase/plan/delPlanDetailAll") @PostMapping("/purchase/plan/delPlanDetailAll")
public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) {
if(purApplyEntity.getId()!=null){ if (purApplyEntity.getId() != null) {
purPlanService.deleteById(purApplyEntity.getId()); purPlanService.deleteById(purApplyEntity.getId());
purPlanDetailService.deleteByOrderId(purApplyEntity.getId() + "" ); purPlanDetailService.deleteByOrderId(purApplyEntity.getId() + "");
}else { } else {
return ResultVOUtils.error(999,"参数有误！"); return ResultVOUtils.error(999, "参数有误！");
} }
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
@ -503,6 +504,7 @@ public class PurPlanController {
purPlanDetailService.update(purPlanDetailEntity); purPlanDetailService.update(purPlanDetailEntity);
return ResultVOUtils.success("修改成功"); return ResultVOUtils.success("修改成功");
} }
/** /**
* 删除采购计划 * 删除采购计划
* *

Write Preview
Loading…
Cancel
Save