|
@@ -6,9 +6,9 @@ import com.zfire.jiasm.syncdata.base.BaseService;
|
|
|
import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
|
|
|
import com.zfire.jiasm.syncdata.constant.DispatchStatusEnum;
|
|
|
import com.zfire.jiasm.syncdata.constant.OrderStatusEnum;
|
|
|
-import com.zfire.jiasm.syncdata.dao.mapper.AzGDFYQDDownloadMapper;
|
|
|
-import com.zfire.jiasm.syncdata.dao.mapper.AzGDFkMxDownloadMapper;
|
|
|
-import com.zfire.jiasm.syncdata.dao.mapper.AzGDLcLsDownloadMapper;
|
|
|
+import com.zfire.jiasm.syncdata.dao.mapper.AZGDFYQDDownloadMapper;
|
|
|
+import com.zfire.jiasm.syncdata.dao.mapper.AZGDFkMxDownloadMapper;
|
|
|
+import com.zfire.jiasm.syncdata.dao.mapper.AZGDLcLsDownloadMapper;
|
|
|
import com.zfire.jiasm.syncdata.parameter.OrderPar;
|
|
|
import com.zfire.jiasm.syncdata.plus.entity.*;
|
|
|
import com.zfire.jiasm.syncdata.plus.service.*;
|
|
@@ -40,7 +40,7 @@ public class AnzhuangGongDanBusiness {
|
|
|
@Resource
|
|
|
ItfTblAzAssignMxDownloadService itfTblAzAssignMxDownloadService;
|
|
|
@Resource
|
|
|
- AzGDLcLsDownloadMapper azGDLcLsDownloadMapper;
|
|
|
+ AZGDLcLsDownloadMapper azGDLcLsDownloadMapper;
|
|
|
@Resource
|
|
|
BaseService baseService;
|
|
|
@Resource
|
|
@@ -66,11 +66,11 @@ public class AnzhuangGongDanBusiness {
|
|
|
@Resource
|
|
|
OrderInstallOperatingLogService orderInstallOperatingLogService;
|
|
|
@Resource
|
|
|
- AzGDFkMxDownloadMapper azGDFkMxDownloadMapper;
|
|
|
+ AZGDFkMxDownloadMapper azGDFkMxDownloadMapper;
|
|
|
@Resource
|
|
|
ItfTblAzAssignFeeDownloadService itfTblAzAssignFeeDownloadService;
|
|
|
@Resource
|
|
|
- AzGDFYQDDownloadMapper azGDFYQDDownloadMapper;
|
|
|
+ AZGDFYQDDownloadMapper azGDFYQDDownloadMapper;
|
|
|
@Resource
|
|
|
OrderInstallService orderInstallService;
|
|
|
@Resource
|
|
@@ -89,6 +89,10 @@ public class AnzhuangGongDanBusiness {
|
|
|
// 3:工单落入本地表
|
|
|
@Scheduled(fixedDelay = 1 * 10 * 1000)
|
|
|
public void inputOrderInstall() {
|
|
|
+ if (1 == 1) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
List<ItfTblAzAssignLcLsDownload> lcls = new ArrayList<>();
|
|
|
List<String> lclslist = new ArrayList<>();
|
|
@@ -171,6 +175,7 @@ public class AnzhuangGongDanBusiness {
|
|
|
OrderBase newLCLS = getOrderBase(item, brand);
|
|
|
// 这里一定不能少
|
|
|
newLCLS.setId(old.getId());
|
|
|
+ newLCLS.setDispatchStatus(old.getDispatchStatus());
|
|
|
|
|
|
// 获取工单主表要同步的数据
|
|
|
OrderBase upInfo = getOrderBase(old, item, newLCLS);
|
|
@@ -822,7 +827,7 @@ public class AnzhuangGongDanBusiness {
|
|
|
getOrderProduct(orderBase, orderProducts, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, orderMx);
|
|
|
// 获取工单操作明细- 操作日志表
|
|
|
List<OrderInstallOperatingLog> oiolList = getOrderInstallOperatingLogs(fkmxs, orderBase, brand, item);
|
|
|
- // 获取安装费用清单
|
|
|
+ // 获取安装费用清单 - 对应扩展表
|
|
|
ItfTblAzAssignFeeDownload fyqd = itfTblAzAssignFeeDownloadService.lambdaQuery()
|
|
|
.eq(ItfTblAzAssignFeeDownload::getDownloadTaskNo, item.getDownloadTaskNo())
|
|
|
.eq(ItfTblAzAssignFeeDownload::getSynStatus,0)
|
|
@@ -1238,6 +1243,14 @@ public class AnzhuangGongDanBusiness {
|
|
|
|
|
|
// 生成工单基础表 对象
|
|
|
orderBase = azGDLcLsDownloadMapper.getOrderBase(orderPar);
|
|
|
+ // 总部下来的工单统一为待接收状态
|
|
|
+ orderBase.setDispatchStatus("DJS");
|
|
|
+ // 预派工订单标识
|
|
|
+ if (orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_A1100.getCode()) ||
|
|
|
+ orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_A1122.getCode()) ||
|
|
|
+ orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_A1130.getCode()) ){
|
|
|
+ orderBase.setIsReservation(1);
|
|
|
+ }
|
|
|
|
|
|
// 重置部分数据
|
|
|
setPar(item, orderBase, brand);
|
|
@@ -1268,8 +1281,8 @@ public class AnzhuangGongDanBusiness {
|
|
|
}
|
|
|
|
|
|
// create_sys - 创建网点系统 cjwdno
|
|
|
- // ast_operator_websit:最近操作网点 创建单时也是创建网点 可能是销售网点,也可能是售后网点 cjwdno 同上
|
|
|
- // sys_websit_number 系统网点编号 cjwdno 同上
|
|
|
+ // last_operator_websit:最近操作网点 创建单时也是创建网点 可能是销售网点,也可能是售后网点 zjczwd
|
|
|
+ // sys_websit_number 系统网点编号 zjczwd 同上
|
|
|
|
|
|
// 先从销售网点查
|
|
|
CustomerInformationWebsit ciw = customerInformationWebsitService.lambdaQuery()
|
|
@@ -1278,8 +1291,6 @@ public class AnzhuangGongDanBusiness {
|
|
|
.one();
|
|
|
if (ciw !=null){
|
|
|
orderBase.setCreateSys(ciw.getWebsitId());
|
|
|
- orderBase.setLastOperatorWebsit(ciw.getWebsitId());
|
|
|
- orderBase.setSysWebsitNumber(ciw.getWebsitId());
|
|
|
} else {
|
|
|
WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
|
|
|
.eq(WebsitOrderSign::getBrandWebsitId, orderBase.getCreateSys())
|
|
@@ -1287,10 +1298,28 @@ public class AnzhuangGongDanBusiness {
|
|
|
.one();
|
|
|
if (wos != null){
|
|
|
orderBase.setCreateSys(wos.getWebsitId());
|
|
|
+ } else {
|
|
|
+ orderBase.setCreateSys("");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // 先从销售网点查
|
|
|
+ CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
|
|
|
+ .eq(CustomerInformationWebsit::getRefWebsitId, orderBase.getLastOperatorWebsit())
|
|
|
+ .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
|
|
|
+ .one();
|
|
|
+ if (ciwx !=null){
|
|
|
+ orderBase.setLastOperatorWebsit(ciwx.getWebsitId());
|
|
|
+ orderBase.setSysWebsitNumber(ciwx.getWebsitId());
|
|
|
+ } else {
|
|
|
+ WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
|
|
|
+ .eq(WebsitOrderSign::getBrandWebsitId, orderBase.getLastOperatorWebsit())
|
|
|
+ .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
|
|
|
+ .one();
|
|
|
+ if (wos != null){
|
|
|
orderBase.setLastOperatorWebsit(wos.getWebsitId());
|
|
|
orderBase.setSysWebsitNumber(wos.getWebsitId());
|
|
|
} else {
|
|
|
- orderBase.setCreateSys("");
|
|
|
orderBase.setLastOperatorWebsit("");
|
|
|
orderBase.setSysWebsitNumber("");
|
|
|
}
|