add

src/main/java/com/zfire/jiasm/syncdata/constant/GDAppointStatusEnum.java

@@ -75,31 +75,39 @@ public enum GDAppointStatusEnum {
     /**
      * 已关闭工单
      */
-    INSTALL_STATUS_A4_1("A1309","已关闭工单"),
+    // INSTALL_STATUS_A4_1("A1309","已关闭工单"),
 
     // 维修-工单派工状态OK
-    REPAIR_STATUS_G0("A1101","保存"),
-    REPAIR_STATUS_G1("A1101","保存"),
-    REPAIR_STATUS_G2("A1121","待分部派工"),
-    REPAIR_STATUS_G3("A1129","待分中心派工"),
-    REPAIR_STATUS_G4("A1129","待网点派工"),
-    REPAIR_STATUS_G5("A1135","待审批改派"),
-    REPAIR_STATUS_G6("B6","待审批支援"),
-    REPAIR_STATUS_G7("A1301","待服务人员处理"),// 20,21,22,23,24
-    REPAIR_STATUS_G8("A1301","服务人员报完工"),
+    //REPAIR_STATUS_G0("A1101","保存"),
+    //REPAIR_STATUS_G1("A1101","保存"),
+    //REPAIR_STATUS_G2("A1121","待分部派工"),
+    //REPAIR_STATUS_G3("A1129","待分中心派工"),
+    //REPAIR_STATUS_G4("A1129","待网点派工"),
+    // REPAIR_STATUS_G5("SQGP","待审批改派"),
+    REPAIR_STATUS_G6("SQGP","待审批支援"),
+
+
+
+    //REPAIR_STATUS_G7("A1301","待服务人员处理"),// 20,21,22,23,24
+    //REPAIR_STATUS_G8("A1301","服务人员报完工"),
     // REPAIR_STATUS_G9("B51","网点报完工"),
-    REPAIR_STATUS_G10("A1301","分中心报完工"),
-    REPAIR_STATUS_G11("A1301","分部报完工"),
+    //REPAIR_STATUS_G10("A1301","分中心报完工"),
+    //REPAIR_STATUS_G11("A1301","分部报完工"),
     //REPAIR_STATUS_G12("B100","历史信息"),
     //REPAIR_STATUS_G13("B101","批量关闭"),
-    REPAIR_STATUS_G14_0("A1304","正常关闭"),
-    REPAIR_STATUS_G14_1("B51","正常关闭"),
-    REPAIR_STATUS_G14_2("B51","正常关闭"),
-    REPAIR_STATUS_G14_3("B71","正常关闭"),
-    REPAIR_STATUS_G15_0("B100","历史信息"),
-    REPAIR_STATUS_G15_1("B101","批量关闭"),
-    REPAIR_STATUS_G15_2("A1309","正常关闭"),
-    REPAIR_STATUS_G16("B103","异常关闭"),
+    //REPAIR_STATUS_G14_0("A1304","正常关闭"),
+    //REPAIR_STATUS_G14_1("B51","正常关闭"),
+    //REPAIR_STATUS_G14_2("B51","正常关闭"),
+    //REPAIR_STATUS_G14_3("B71","正常关闭"),
+    //REPAIR_STATUS_G15_0("B100","历史信息"),
+    //REPAIR_STATUS_G15_1("B101","批量关闭"),
+    //REPAIR_STATUS_G15_2("A1309","正常关闭"),
+    //REPAIR_STATUS_G16("B103","异常关闭"),
+
+
+
+    REPAIR_STATUS_G13("YCJ","已采集"),
+    REPAIR_STATUS_G14("YBWG","已报完工"),
 
 
     ;

src/main/java/com/zfire/jiasm/syncdata/constant/GDAppointStatusEnumBak.java

@@ -84,21 +84,24 @@ public enum GDAppointStatusEnumBak {
     REPAIR_STATUS_G4("B4","待网点派工"),
     REPAIR_STATUS_G5("B5","待审批改派"),
     REPAIR_STATUS_G6("B6","待审批支援"),
-    REPAIR_STATUS_G7("B18","待服务人员处理"),// 20,21,22,23,24
-    REPAIR_STATUS_G8("B18","服务人员报完工"),
+    //REPAIR_STATUS_G7("B18","待服务人员处理"),// 20,21,22,23,24
+    //REPAIR_STATUS_G8("B18","服务人员报完工"),
     // REPAIR_STATUS_G9("B51","网点报完工"),
-    REPAIR_STATUS_G10("B18","分中心报完工"),
-    REPAIR_STATUS_G11("B18","分部报完工"),
+    //REPAIR_STATUS_G10("B18","分中心报完工"),
+    //REPAIR_STATUS_G11("B18","分部报完工"),
     //REPAIR_STATUS_G12("B100","历史信息"),
     //REPAIR_STATUS_G13("B101","批量关闭"),
-    REPAIR_STATUS_G14_0("B41","正常关闭"),
-    REPAIR_STATUS_G14_1("B51","正常关闭"),
-    REPAIR_STATUS_G14_2("B61","正常关闭"),
-    REPAIR_STATUS_G14_3("B71","正常关闭"),
-    REPAIR_STATUS_G15_0("B100","历史信息"),
-    REPAIR_STATUS_G15_1("B101","批量关闭"),
-    REPAIR_STATUS_G15_2("B102","正常关闭"),
-    REPAIR_STATUS_G16("B103","异常关闭"),
+    //REPAIR_STATUS_G14_0("A1304","正常关闭"),
+    //REPAIR_STATUS_G14_1("B51","正常关闭"),
+    //REPAIR_STATUS_G14_2("B51","正常关闭"),
+    //REPAIR_STATUS_G14_3("B71","正常关闭"),
+    //REPAIR_STATUS_G15_0("B100","历史信息"),
+    //REPAIR_STATUS_G15_1("B101","批量关闭"),
+    //REPAIR_STATUS_G15_2("A1309","正常关闭"),
+    //REPAIR_STATUS_G16("B103","异常关闭"),
+
+    REPAIR_STATUS_G13("YCJ","已采集"),
+    REPAIR_STATUS_G14("YBWG","已报完工"),
 
 
     ;

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

@@ -361,20 +361,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 			}
 
 			// 生成采集条码数据
-			if (oids.size()>0){
-				for (OrderInstallDetail a :oids){
-					log.info("生成采集条码表a {}",JSONObject.toJSONString(a));
-
-					// 把条码信息放在采集条码表中使用
-					if (StringUtils.isNotEmpty(a.getInsideCode())){
-						outid = getInOutid(oidcs, outid, order, a, a.getInsideCode(), "1");
-					}
-					if (StringUtils.isNotEmpty(a.getOutCode())){
-						outid = getInOutid(oidcs, outid, order, a, a.getOutCode(), "2");
-					}
-					log.info("生成采集条码表b {}",JSONObject.toJSONString(oidcs));
-				}
-			}
+			getOrderInstallDetailCode(oids, oidcs, outid, order);
 
 
 			if (oids.size()>0){
@@ -395,6 +382,22 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		upSynStatusAzJykt(downloadTaskNo);
 	}
 
+	private void getOrderInstallDetailCode(List<OrderInstallDetail> oids, List<OrderInstallDetailCode> oidcs, int outid, OrderBase order) {
+		if (oids.size()>0){
+			for (OrderInstallDetail a : oids){
+				// log.info("生成采集条码表a {}",JSONObject.toJSONString(a));
+
+				// 把条码信息放在采集条码表中使用
+				if (StringUtils.isNotEmpty(a.getInsideCode())){
+					outid = getInOutid(oidcs, outid, order, a, a.getInsideCode(), "1");
+				}
+				if (StringUtils.isNotEmpty(a.getOutCode())){
+					outid = getInOutid(oidcs, outid, order, a, a.getOutCode(), "2");
+				}
+			}
+		}
+	}
+
 	private int getInOutid(List<OrderInstallDetailCode> oidcs, int outid, OrderBase order, OrderInstallDetail a, String insideCode, String s) {
 		OrderInstallDetailCode odf = new OrderInstallDetailCode();
 		odf.setId(IdWorker.getIdStr());
@@ -438,9 +441,6 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 				.eq(ItfTblAzWgmxJyktFjDownload::getDownloadTaskNo, downloadTaskNo)
 				.eq(ItfTblAzWgmxJyktFjDownload::getSynStatus,0).list();
 
-
-		log.info("采集明细 pgguid {}",pgguid);
-
 		// 提取采集数据
 		oids = orderInstallDetailService.lambdaQuery()
 				.eq(OrderInstallDetail::getPgwcmxid,pgguid).list();
@@ -449,17 +449,11 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 
 
 		if (!CollectionUtils.isEmpty(jykts)){
-			log.info("采集明细a {}", JSONObject.toJSONString(jykts));
-
-			log.info("采集明细b {}", JSONObject.toJSONString(oids));
-
 			// 提取工单数据
 			OrderBase order = orderBaseService.lambdaQuery()
 					.eq(OrderBase::getId,oids.get(0).getOrderBaseId())
 					.last("limit 1").one();
 
-			log.info("采集明细c {}", JSONObject.toJSONString(order));
-
 			if (order!=null){
 				// 提取现有的采集附件数据
 				List<OrderDetailFile> fs = orderDetailFileService.lambdaQuery()
@@ -471,28 +465,19 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 					});
 				}
 
-				log.info("采集明细 fsFjguid {}", JSONObject.toJSONString(fsFjguid));
-
 				for (ItfTblAzWgmxJyktFjDownload item :jykts){
-
-					log.info("采集明细x ");
-
 					// 采集明细表未同步不处理
 					if (!oidsMap.containsKey(item.getPgwcmxid())){
 						odfs.clear();
 						break;
 					}
-					log.info("采集明细 item {}", JSONObject.toJSONString(item));
-
 					// 生成采集附件明细数据 暂时忽略更新，无新增
 					if (!fsFjguid.contains(item.getFjguid())){
 						OrderDetailFile a = new OrderDetailFile();
 						getItfTblAzWgmxJyktFj(odfs,oidsMap.get(item.getPgwcmxid()).get(0), order, item, a);
 
 					}
-
 				}
-				log.info("采集明细 odfs {}", JSONObject.toJSONString(odfs));
 
 				if (odfs.size()>0) {
 					orderDetailFileService.saveBatch(odfs);

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

@@ -1690,12 +1690,9 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                 orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G10.getCode()) ||
                 orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G11.getCode()) ||
                 orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G14.getCode())) &&
-                !(orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G1.getCode()) ||
-                        orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G2.getCode()) ||
-                        orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G3.getCode()) ||
-                        orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G4.getCode()) ||
-                        orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G5.getCode()) ||
-                        orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G6.getCode()))){
+                (orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G6.getCode()) ||
+                        orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G13.getCode()) ||
+                        orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G14.getCode()))){
             // 不上传总部的工单报完工后全部发评价
             String pgid="";
             if (StringUtils.isEmpty(orderBase.getPgid()) || orderBase.getPgid().equals("0")){

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

@@ -379,11 +379,9 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
                 orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G12.getCode())||
                 orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G13.getCode())||
                 orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G14.getCode())) &&
-                (orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G14_0) ||
-                        orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G14_1)||
-                        orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G15_0)||
-                        orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G15_1)||
-                        orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G15_2)) &&
+                (orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G13) ||
+                        orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G14)||
+                        orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G14.getCode())) &&
                 orderBase.getOutCjDownloadFlag().equals(0)){
             OutJiasmToGreeUploadTaskList add = publicService.getUploadTaskList(itemOrderNo, itemTableNameId, itemTableName,
                     orderBase.getOrderType(),661);