add

src/main/java/com/zfire/jiasm/syncdata/api/OrderAddBeanDTO.java

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.api;
 import com.zfire.jiasm.syncdata.plus.entity.OrderCleanItem;
 import com.zfire.jiasm.syncdata.plus.entity.OrderMaterial;
 import com.zfire.jiasm.syncdata.plus.entity.OrderProduct;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -153,6 +154,8 @@ public class OrderAddBeanDTO {
     private String shopFlag;
     // 产品信息/故障信息
     private List<OrderProduct> orderProductList = new ArrayList<>();
+    // 当前工单状态
+    private String orderStatus;
 
     // 工程单号-销售类型为工程机必填
     private String enginNo;

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

@@ -57,18 +57,18 @@ public class InstallProduceUploadListServiceImpl implements InstallProduceUpload
         log.info("开始预处理需要上传的工单数据: \uF0B7{}",sdf.format(new Date()));
 
         //测试使用
-        /*Test orderno = testService.lambdaQuery()
+        Test orderno = testService.lambdaQuery()
                 .eq(Test::getFlag,1)
                 .last("limit 1").one();
         if (orderno==null){
             return;
-        }*/
+        }
 
         // 从需要上传的订单数据表中提取数据
         taskResults = outJiasmToGreeUploadnotifylistService.lambdaQuery()
                 .eq(OutJiasmToGreeUploadnotifylist::getSynStatus, SynStatusEnum.UN_SYN.getCode())
                 // .eq(OutJiasmToGreeUploadnotifylist::getSynReqId, 20916)// 测试用
-                // .eq(OutJiasmToGreeUploadnotifylist::getOrderNo, orderno.getId())// 测试用
+                .eq(OutJiasmToGreeUploadnotifylist::getOrderNo, orderno.getId())// 测试用
                 .orderByAsc(OutJiasmToGreeUploadnotifylist::getSynReqId)
                 .list();
         try {

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

@@ -70,19 +70,19 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
         log.info("开始预处理需要上传的维修工单数据: \uF0B7{}",sdf.format(new Date()));
 
         //测试使用
-        /*Test orderno = testService.lambdaQuery()
+        Test orderno = testService.lambdaQuery()
                 .eq(Test::getFlag,1)
                 .last("limit 1").one();
         if (orderno==null){
             return;
-        }*/
+        }
 
 
         // 从需要上传的订单数据表中提取数据
         List<OutJiasmToGreeUploadnotifylist> taskResults = outJiasmToGreeUploadnotifylistService.lambdaQuery()
                 .eq(OutJiasmToGreeUploadnotifylist::getSynStatus,0)
                 // .eq(OutJiasmToGreeUploadnotifylist::getSynReqId,20916)// 测试用
-                // .eq(OutJiasmToGreeUploadnotifylist::getOrderNo, orderno.getId())// 测试用
+                .eq(OutJiasmToGreeUploadnotifylist::getOrderNo, orderno.getId())// 测试用
                 .orderByAsc(OutJiasmToGreeUploadnotifylist::getSynReqId).list();
         try{
             Token token = tokenCenter.getCurrentToken();