|
|
|
@ -201,6 +201,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder |
|
|
|
|
orderProcessInfo.setDdlx(OrderInfoEnum.ORDER_TYPE_3.getKey()); |
|
|
|
|
orderProcessInfo.setDdzt(OrderInfoEnum.ORDER_STATUS_0.getKey()); |
|
|
|
|
orderProcessInfo.setYzfp(ConfigureConstant.STRING_1); |
|
|
|
|
orderProcessInfo.setXtly(OrderInfoEnum.SYS_SOURCE_EXCEL.getKey()); |
|
|
|
|
commonOrderInfo.setProcessInfo(orderProcessInfo); |
|
|
|
|
commonOrderInfo.getOrderInfo().setCreateTime(new Date()); |
|
|
|
|
commonOrderInfo.getOrderInfo().setUpdateTime(new Date()); |
|
|
|
@ -648,7 +649,11 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder |
|
|
|
|
orderProcessInfo.setDdly(commonOrderInfo.getProcessInfo().getDdly()); |
|
|
|
|
orderProcessInfo.setDdzt(commonOrderInfo.getProcessInfo().getDdzt()); |
|
|
|
|
orderProcessInfo.setBzdh(StrUtil.isBlank(commonOrderInfo.getProcessInfo().getBzdh())?commonOrderInfo.getOrderInfo().getBzdh():commonOrderInfo.getProcessInfo().getBzdh()); |
|
|
|
|
orderProcessInfo.setXtly("FPPTEXCEL"); |
|
|
|
|
if(StringUtils.isNotBlank(commonOrderInfo.getProcessInfo().getXtly())){ |
|
|
|
|
orderProcessInfo.setXtly(commonOrderInfo.getProcessInfo().getXtly()); |
|
|
|
|
}else{ |
|
|
|
|
orderProcessInfo.setXtly("FPPTEXCEL"); |
|
|
|
|
} |
|
|
|
|
orderProcessInfo.setBhzt(ConfigureConstant.STRING_0); |
|
|
|
|
orderProcessInfo.setYzfp(commonOrderInfo.getProcessInfo().getYzfp()); |
|
|
|
|
orderProcessInfo.setKb(orderItemInfos.get(0).getKb()); |
|
|
|
|