add

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPGFWebsitWorker.java

@@ -27,23 +27,10 @@ import java.util.*;
 @Slf4j
 @Component
 public class GLPPGFWebsitWorker {
-    @Value("${baseurl}")
-    private String baseurl = "";
-    @Value("${fsxwxgc}")
-    private String fsxwxgc = "";
-    @Value("${gzxwxgc}")
-    private String gzxwxgc = "";
-    @Value("${fsswxgc}")
-    private String fsswxgc = "";
-    @Value("${gzswxgc}")
-    private String gzswxgc = "";
     @Value("${gfwwwc}")
     private String gfwwwc = "";
 
 
-
-    @Resource
-    TokenCenter tokenCenter;
     @Resource
     GLPPGFWebsitWorkerService glppgfWebsitWorkerService;
 /*

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPGuZhandDaiMa.java

@@ -26,9 +26,9 @@ import java.util.Map;
  * 格力品牌固障代码基础资料下载  同步一次不再同步，PC端使用
  */
 @Slf4j
-// @Component
+@Component
 public class GLPPGuZhandDaiMa {
-    /*@Value("${baseurl}")
+    @Value("${baseurl}")
     private String baseurl = "";
     @Value("${guzdmc}")
     private String guzdmc = "";
@@ -43,10 +43,11 @@ public class GLPPGuZhandDaiMa {
 
 
 
-    *//**
+    /*
      * 格力品牌固障代码资料信息同步 同步一次不再使用
      * @return
-     *//*
+     */
+
     @Scheduled(fixedDelayString = "${guzdm}")
     public void processGZDMTask() throws Exception {
         if (guzdmc.equals(TaskConfigEnum.FALSE.getCode())){
@@ -86,6 +87,6 @@ public class GLPPGuZhandDaiMa {
         }else {
             log.info("["+url+"]无数据");
         }
-    }*/
+    }
 
 }

src/main/java/com/zfire/jiasm/syncdata/download/basedata/MasterDownloadTask.java

@@ -19,6 +19,7 @@ import java.util.Date;
 import java.util.List;
 
 // 定时执行一次
+// 师傅端使用
 @Slf4j
 @Component
 public class MasterDownloadTask {

src/main/java/com/zfire/jiasm/syncdata/service/PublicService.java

@@ -120,4 +120,5 @@ public interface PublicService {
     Boolean checkWebsitSyncFlag(String orderNo,String tableName,Long recordId);
     Boolean checkWebsitSyncFlagT(String orderNo,String tableName,String recordId);
 
+
 }

src/main/java/com/zfire/jiasm/syncdata/service/impl/BaseDownServiceImpl.java

@@ -87,7 +87,7 @@ public class BaseDownServiceImpl implements BaseDownService {
         processGLPPGFWebsitWorker();
 
         // 格力品牌固障代码基础资料下载  同步一次不再同步，PC端使用
-        processGLPPGuZhandDaiMa();
+        //  processGLPPGuZhandDaiMa();
 
         // 格力品牌类别系列基础资料下载（大类、小类、系列、机型） 单独开任务处理了，这里不需要再执行(GLPPLeiBie)
         // processGLPPLeiBie();

src/main/java/com/zfire/jiasm/syncdata/service/impl/PublicServiceImpl.java

@@ -1271,11 +1271,12 @@ public class PublicServiceImpl implements PublicService {
     }
 
     /**
-     *   网点不在需要回传的网点表内，这里直接进行修改不再回传同步状态
+     *   1：网点不存在需要回传的网点表内，改回传同步状态字段为99
+     *   2：回传网点表为空时 一样不回传
      * @param orderNo 工单ID
      * @param tableName 表名
      * @param recordId 记录ID
-     * @return
+     * @return false回传， true 不回传
      */
     @Override
     public Boolean checkWebsitSyncFlag(String orderNo,String tableName,Long recordId){
@@ -1291,17 +1292,15 @@ public class PublicServiceImpl implements PublicService {
             return Boolean.FALSE;
         }
 
-        if (order !=null){
-            // 售后网点处理
-            websit = publicService.ptshwdToshshwd(order.getWebsitId(), order.getMainId());
-            SynUploadWebsit websitinfo = synUploadWebsitService.lambdaQuery()
-                    .eq(SynUploadWebsit::getBrandWebsitNo,websit.getWdId()).one();
-            if (websitinfo != null){
-                // 回传  找到相应的网点说明该网点需要回传
-                return Boolean.FALSE;
-            }
-            msg = "【"+websitinfo.getBrandWebsitNo() + "】网点工单信息不需要回传";
+        // 售后网点处理
+        websit = publicService.ptshwdToshshwd(order.getWebsitId(), order.getMainId());
+        SynUploadWebsit websitinfo = synUploadWebsitService.lambdaQuery()
+                .eq(SynUploadWebsit::getBrandWebsitNo,websit.getWdId()).one();
+        if (websitinfo != null){
+            // 回传  找到相应的网点说明该网点工单需要回传
+            return Boolean.FALSE;
         }
+        msg = "【"+websitinfo.getBrandWebsitNo() + "】网点工单信息不需要回传";
 
         // 不回传 修改无需同步
         uploadService.updateNotSync(tableName, recordId,msg);
@@ -1309,11 +1308,12 @@ public class PublicServiceImpl implements PublicService {
     }
 
     /**
-     *   网点不在需要回传的网点表内，这里直接进行修改不再回传同步状态
+     *   1：网点不存在需要回传的网点表内，改回传同步状态字段为99
+     *   2：回传网点表为空时 一样不回传
      * @param orderNo 工单ID
      * @param tableName 表名
      * @param recordId 记录ID
-     * @return
+     * @return false回传， true 不回传
      */
     @Override
     public Boolean checkWebsitSyncFlagT(String orderNo,String tableName,String recordId){
@@ -1329,17 +1329,15 @@ public class PublicServiceImpl implements PublicService {
             return Boolean.FALSE;
         }
 
-        if (order !=null){
-            // 售后网点处理
-            websit = publicService.ptshwdToshshwd(order.getWebsitId(), order.getMainId());
-            SynUploadWebsit websitinfo = synUploadWebsitService.lambdaQuery()
-                    .eq(SynUploadWebsit::getBrandWebsitNo,websit.getWdId()).one();
-            if (websitinfo != null){
-                // 回传  找到相应的网点说明该网点需要回传
-                return Boolean.FALSE;
-            }
-            msg = "【"+websitinfo.getBrandWebsitNo() + "】网点工单信息不需要回传";
+        // 售后网点处理
+        websit = publicService.ptshwdToshshwd(order.getWebsitId(), order.getMainId());
+        SynUploadWebsit websitinfo = synUploadWebsitService.lambdaQuery()
+                .eq(SynUploadWebsit::getBrandWebsitNo,websit.getWdId()).one();
+        if (websitinfo != null){
+            // 回传  找到相应的网点说明该网点需要回传
+            return Boolean.FALSE;
         }
+        msg = "【"+websitinfo.getBrandWebsitNo() + "】网点工单信息不需要回传";
 
         // 不回传 修改无需同步
         uploadService.updateNotSyncT(tableName, recordId,msg);

src/main/java/com/zfire/jiasm/syncdata/service/impl/RepairProduceDataUploadServiceImpl.java

@@ -143,6 +143,8 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     OSSUtil ossUtil;
     @Resource
     GreeLogic greeLogic;
+    @Resource
+    RepairBugService repairBugService;
 
 
 
@@ -508,6 +510,9 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         request.setId(sourceData.getId());
         request.setOrderNo(sourceData.getOrderNo());
         ItfTblAssignMxUpload mx = getOrderProductMapper.getItfTblAssignMxUpload(request);
+        // 这里故障代码单独处理
+        setMxGzxxid(sourceData, mx);
+
         mx.setWorkerOrderNo(sourceData.getOrderNo());
         // 销售单位处理
         websitSH = publicService.ptxswdToshxswd(mx.getXsdw(),orderBase.getMainId());
@@ -521,6 +526,35 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         itfTblAssignMxUploadService.save(mx);
     }
 
+    private void setMxGzxxid(OutJiasmToGreeUploadTaskList sourceData, ItfTblAssignMxUpload mx) {
+        RepairBug repairBug =null;
+        OrderProduct orderProduct = orderProductService.lambdaQuery()
+        .eq(OrderProduct::getId, sourceData.getId()).one();
+        // 大小类一起查询
+        if (StringUtils.isNotEmpty(orderProduct.getSmallId())){
+            repairBug = repairBugService.lambdaQuery()
+                    .eq(RepairBug::getMainId,orderProduct.getMainId())
+                    .eq(RepairBug::getSmallId,orderProduct.getSmallId())
+                    .eq(RepairBug::getBugObj,orderProduct.getFaultReason())
+                    .eq(RepairBug::getStatus,"ON")
+                    .last("limit 1").one();
+            if (repairBug!=null){
+                mx.setGzxxid(repairBug.getGzid());
+            }
+        }
+        // 大类查询 大类一定有
+        if (repairBug == null){
+            repairBug = repairBugService.lambdaQuery()
+                    .eq(RepairBug::getMainId,orderProduct.getMainId())
+                    .eq(RepairBug::getBugObj,orderProduct.getFaultReason())
+                    .eq(RepairBug::getStatus,"ON")
+                    .last("limit 1").one();
+            if (repairBug!=null){
+                mx.setGzxxid(repairBug.getGzid());
+            }
+        }
+    }
+
     public void upPgmxid(OutJiasmToGreeUploadTaskList row, OutJiasmToGreeUploadTaskList sourceData, String newDykh) {
         OrderPar orderPar = new OrderPar();
         orderPar.setOrderNo(sourceData.getOrderNo());

src/main/java/com/zfire/jiasm/syncdata/upload/order/DataUpload.java

@@ -70,7 +70,7 @@ public class DataUpload {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<OutJiasmToGreeSynRule> synRules = new ArrayList<>();
 
-        // 数据同步记录表中提取数据 out_jiasm_to_gree_syn_rule
+        // 数据同步规则记录表中提取数据 out_jiasm_to_gree_syn_rule
         List<Map<String, Object>> result = uploadService.getTaskData();
         Token token = tokenCenter.getCurrentToken();
 

src/main/java/com/zfire/jiasm/syncdata/upload/order/DataUploadNew.java

@@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
  * 修改同步表的同步状态
  */
 @Slf4j
-@Component
+// @Component
 public class DataUploadNew {/*
     @Value("${datauploadc}")
     private String datauploadc = "";

src/main/resources/bootstrap-dev.properties

@@ -174,7 +174,7 @@ workercertificate=60000
 workercerupload=5000
 detaildown=2000
 #安装工单下载 、入本地表
-installdown=5000
+installdown=2000
 installin=5000
 #维修工单下载、入本地表
 repairdown=5000
@@ -200,7 +200,7 @@ masterdownloadrate=10000
 masterrate=10000
 guzdm=3600000
 #网点 佛山销售网点|售后网点、广州销售网点|售后网点
-netfsx=60000
+netfsx=600000
 netfss=60000
 netgzx=60000
 netgzs=60000
@@ -209,9 +209,9 @@ fsxwxg=60000
 fsswxg=60000
 gzxwxg=60000
 gzswxg=60000
-gfwww=60000
+gfwww=300000
 #类别大类、小类、系列、机型
-lbdl=60000
+lbdl=300000
 lbxl=60000
 lbxlt=60000
 lbjx=60000

src/main/resources/bootstrap-prd.properties

@@ -169,7 +169,7 @@ workercertificate=60000
 workercerupload=5000
 detaildown=2000
 #安装工单下载 、入本地表
-installdown=5000
+installdown=2000
 installin=5000
 #维修工单下载、入本地表
 repairdown=5000
@@ -195,18 +195,18 @@ masterdownloadrate=60000
 masterrate=10000
 guzdm=3600000
 #网点 佛山销售网点|售后网点、广州销售网点|售后网点
-netfsx=10000
-netfss=10000
-netgzx=10000
-netgzs=10000
+netfsx=600000
+netfss=600000
+netgzx=600000
+netgzs=600000
 #网点维修工 佛山销售|售后、广州销售|售后
 fsxwxg=60000
 fsswxg=10000
 gzxwxg=10000
 gzswxg=10000
-gfwww=60000
+gfwww=300000
 #类别大类、小类、系列、机型
-lbdl=60000
+lbdl=300000
 lbxl=60000
 lbxlt=60000
 lbjx=60000

src/main/resources/bootstrap-test.properties

@@ -175,7 +175,7 @@ workercertificate=60000
 workercerupload=60000
 detaildown=60000
 #安装工单下载 、入本地表
-installdown=5000
+installdown=2000
 installin=5000
 #维修工单下载、入本地表
 repairdown=5000
@@ -201,20 +201,20 @@ masterdownloadrate=7200000
 masterrate=7200000
 guzdm=7200000
 #网点 佛山销售网点|售后网点、广州销售网点|售后网点
-netfsx=7200000
-netfss=7200000
-netgzx=7200000
-netgzs=7200000
+netfsx=600000
+netfss=600000
+netgzx=600000
+netgzs=600000
 #网点 维修工 佛山销售|售后、广州销售|售后
 fsxwxg=7200000
 fsswxg=7200000
 gzxwxg=7200000
 gzswxg=7200000
 #类别大类、小类、系列、机型
-lbdl=7200000
-lbxl=7200000
-lbxlt=7200000
-lbjx=7200000
+lbdl=300000
+lbxl=300000
+lbxlt=300000
+lbjx=300000
 #销售类型
 azxslx=7200000
 #需求类别 需求大类、小类
@@ -255,7 +255,7 @@ zjzxx=60000
 lmxx=60000
 wxgwz=60000
 wxgxg=60000
-gfwww=60000
+gfwww=300000
 wxgwzt=60000
 #京东商城 预约改约、指派改派网点、作废取消、报完工、指派改派人员
 jdyygy=30000
@@ -394,8 +394,8 @@ installinc=TRUE
 repairinc=TRUE
 #######################安装与维修工单控制参数(从总部与从工单获取互斥)###############################
 #安装、维修工单总部下载
-installdownc=TRUE
-repairdownc=TRUE
+installdownc=FALSE
+repairdownc=FALSE
 #安装与维修工单从工单系统下载
-installflag=FALSE
-repairflag=FALSE
+installflag=TRUE
+repairflag=TRUE

src/main/resources/mapper/GetOrderProductMapper.xml

@@ -11,13 +11,12 @@
                '' as gzwz,a.fault_reason as gzxx, a.create_by as czren,a.sale_websit as xsdw,
                a.sale_websit_mobile as xsdwdh,a.service_websit_mobile as fwdwdh,
                a.remark as beiz,'' as qqlyxh,'' as pinpai,a.price as fee,0 as xxfee,
-               '' as hsqk,i.gzid as gzxxid,a.num as shul,0 as wxcount,0 as yblength
+               '' as hsqk,a.num as shul,0 as wxcount,0 as yblength
         from order_product a
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
                  left join sys_dict_ref d on d.dict_code=a.small_id and d.brand_id = #{request.brandId} and d.dict_type='SMALL_TYPE'
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
                  left join product f on f.product_id = a.product_id
-                 left join repair_bug i on i.main_id=a.main_id and i.bug_obj=a.fault_reason
         where a.id = #{request.id}
     </select>