|
|
|
@ -17,6 +17,9 @@ import jnpf.base.service.ProvinceAtlasService;
|
|
|
|
|
import jnpf.base.service.ProvinceService;
|
|
|
|
|
import jnpf.base.util.OptimizeUtil;
|
|
|
|
|
import jnpf.constant.MsgCode;
|
|
|
|
|
import jnpf.engine.entity.FlowTaskNodeEntity;
|
|
|
|
|
import jnpf.engine.service.FlowTaskNodeService;
|
|
|
|
|
import jnpf.engine.service.FlowTaskService;
|
|
|
|
|
import jnpf.exception.DataException;
|
|
|
|
|
import jnpf.model.PathTypeModel;
|
|
|
|
|
import jnpf.model.UploaderVO;
|
|
|
|
@ -125,6 +128,10 @@ public class VoucherController {
|
|
|
|
|
private WarehousingStorageProductService warehousingStorageProductService;
|
|
|
|
|
@Autowired
|
|
|
|
|
private ReceiptOrderService receiptOrderService;
|
|
|
|
|
@Autowired
|
|
|
|
|
private FlowTaskService flowTaskService;
|
|
|
|
|
@Autowired
|
|
|
|
|
private FlowTaskNodeService flowTaskNodeService;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 列表
|
|
|
|
@ -506,6 +513,17 @@ public class VoucherController {
|
|
|
|
|
if(entity!=null){
|
|
|
|
|
try{
|
|
|
|
|
voucherService.saveOrUpdate(voucherForm,id,false);
|
|
|
|
|
FlowTaskEntity flowTaskEntity = flowTaskService.getById(id);
|
|
|
|
|
if (flowTaskEntity!=null){
|
|
|
|
|
QueryWrapper<FlowTaskNodeEntity> flowTaskNodeEntityQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getNodeCode, flowTaskEntity.getThisStepId());
|
|
|
|
|
flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getTaskId, flowTaskEntity.getId());
|
|
|
|
|
List<FlowTaskNodeEntity> flowTaskNodeEntityList = flowTaskNodeService.list(flowTaskNodeEntityQueryWrapper);
|
|
|
|
|
if(flowTaskNodeEntityList != null && flowTaskNodeEntityList.size()>0 && "end".equals(flowTaskNodeEntityList.get(0).getNodeNext())) {
|
|
|
|
|
entity.setVoucherStatus("3");
|
|
|
|
|
voucherService.saveOrUpdate(entity);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}catch(Exception e){
|
|
|
|
|
return ActionResult.fail("修改数据失败");
|
|
|
|
|
}
|
|
|
|
|