|
@@ -1155,10 +1155,15 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
if (apsCraftRouteDo == null) {
|
|
|
apsCraftRouteDo = apsProcessOperationDao.getCraftRoute(craftrouteid);
|
|
|
}
|
|
|
+ String routeNum = apsCraftRouteDo.getRoutenum();
|
|
|
+ if (StringUtils.isBlank(routeNum)) {
|
|
|
+ apsCraftRouteDo = apsProcessOperationDao.getCraftRoute(craftrouteid);
|
|
|
+ routeNum = apsCraftRouteDo.getRoutenum();
|
|
|
+ }
|
|
|
apsBlankOrderService.update(new LambdaUpdateWrapper<ApsBlankOrderDo>()
|
|
|
.eq(ApsBlankOrderDo::getId, blanckdata.getStr("ID"))
|
|
|
.set(ApsBlankOrderDo::getCraftrouteid, craftrouteid)
|
|
|
- .set(ApsBlankOrderDo::getRoption, "{\"dataSource\":\"" + dataType + "\",\"blanckId\",\"" + newblankid + "\",\"routeNum\":\"" + apsCraftRouteDo.getRoutenum() + "\"}")
|
|
|
+ .set(ApsBlankOrderDo::getRoption, "{\"dataSource\":\"" + dataType + "\",\"blanckId\",\"" + newblankid + "\",\"routeNum\":\"" + routeNum + "\"}")
|
|
|
.set(ApsBlankOrderDo::getRouteproducttypeid, apsCraftRouteDo.getProducttype())
|
|
|
.set(ApsBlankOrderDo::getRoutemetal, apsCraftRouteDo.getMetal())
|
|
|
.set(ApsBlankOrderDo::getRoutemetalstate, apsCraftRouteDo.getMetalstate())
|