|
@@ -131,8 +131,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public boolean orderBaseInstall(Brand brand, @NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap){
|
|
public boolean orderBaseInstall(Brand brand, @NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap){
|
|
|
OrderBase orderBase = orderBaseService.lambdaQuery()
|
|
OrderBase orderBase = orderBaseService.lambdaQuery()
|
|
@@ -301,7 +299,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
- private Boolean getPJmessage(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls,Brand brand) {
|
|
|
|
|
|
|
+ public Boolean getPJmessage(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls,Brand brand) {
|
|
|
WebsitSH websitSH = new WebsitSH();
|
|
WebsitSH websitSH = new WebsitSH();
|
|
|
|
|
|
|
|
// 生成评价短信 不能写在产品中要写在表头,只写一次 派工状态为4(1304,1309与工单状态相同) 完工或已关闭的单
|
|
// 生成评价短信 不能写在产品中要写在表头,只写一次 派工状态为4(1304,1309与工单状态相同) 完工或已关闭的单
|
|
@@ -394,13 +392,13 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // 获取完工采集明细数据 (家用空调、商用空调、其他)
|
|
|
|
|
|
|
+ // 获取完工采集明细数据 (家用空调、商用空调、其他) 内外机条码在这里生成
|
|
|
getCJMXData(brand, orderBase, lcls, detail,mainName);
|
|
getCJMXData(brand, orderBase, lcls, detail,mainName);
|
|
|
|
|
|
|
|
- // 获取采集附件数据 (家用、商用、其他)
|
|
|
|
|
|
|
+ // 获取采集附件数据 (家用、商用、其他) 显示的图片信息在这里生成
|
|
|
getcjfjdata(orderBase, detail, mainName);
|
|
getcjfjdata(orderBase, detail, mainName);
|
|
|
|
|
|
|
|
- // 生成条码明细数据
|
|
|
|
|
|
|
+ // 生成条码明细数据 这里好像并没用可以去掉
|
|
|
getDetailCode(orderBase, detail, mainName);
|
|
getDetailCode(orderBase, detail, mainName);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -490,7 +488,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- @Nullable
|
|
|
|
|
public void getCJMXData(Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls,
|
|
public void getCJMXData(Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls,
|
|
|
OrderInstallDetail detail,String mainName) {
|
|
OrderInstallDetail detail,String mainName) {
|
|
|
|
|
|