add

src/main/java/com/zfire/jiasm/syncdata/dao/mapper/CodeOrderInstallDetailMapper.java

@@ -24,6 +24,9 @@ public interface CodeOrderInstallDetailMapper extends BaseMapper<OrderInstallDet
     void updateCodePgguid(@Param("request") InstalDetailCode request);
     void updateCodeOutId(@Param("request") InstalDetailCode request);
 
+    void updateCodeIncodePath(@Param("request") InstalDetailCode request);
+    void updateCodeOutcodePath(@Param("request") InstalDetailCode request);
+
     List<OrderInstallDetailCode> getIdCj(@Param("request") InstalDetailCode request);
     ItfTblAzWgmxSyktTmmxLsUpload getSyCodeCj(@Param("request") InstalDetailCode request);
 }

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

@@ -112,7 +112,8 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean orderBaseInstallCjOrWg(String cjOrWg, Brand brand, OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap){
+    public Boolean orderBaseInstallCjOrWg(String cjOrWg, Brand brand, OutJiasmToGreeUploadTaskList ojtutl,
+                                          Map<String, List<SysDictRef>> CategoryRefmap){
         OrderBase orderBase = orderBaseService.lambdaQuery()
                 .eq(OrderBase::getId, ojtutl.getId())
                 .last("limit 1")
@@ -439,7 +440,15 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             }
         }
 
-        // 处理条码明细
+        // 管理端采集的条码图并没全部给到采集条码表中，这里需要转移到采集条码表中
+        InstalDetailCode codep = new InstalDetailCode();
+        codep.setOrderNo(detail.getOrderBaseId());
+        // 内机条码图
+        codeOrderInstallDetailMapper.updateCodeIncodePath(codep);
+        // 外机条码图
+        codeOrderInstallDetailMapper.updateCodeOutcodePath(codep);
+
+        // 处理条码明细 只有商用空调才处理
         if (!getDetailCodeCj(orderBase, detail, mainName, taskno, synReqId)){
             return Boolean.FALSE;
         }
@@ -455,10 +464,12 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         instalDetailCode.setId(detail.getId());
         List<OrderInstallDetailCode> codes = codeOrderInstallDetailMapper.getIdCj(instalDetailCode);
         // 采集附近件表可能已上传条码图片，如上传这里不再上传直接赋值即可
-
-
         // 处理条码明细
         for (OrderInstallDetailCode code :codes){
+            // 作废的不处理
+            if (code.getStatus() == 0 ){
+                continue;
+            }
             if (StringUtils.isEmpty(code.getPath())){
                 publicService.updateUploadTaskListInfo(synReqId,"order_install_detail_code.path未准备上传被忽略");
                 return Boolean.FALSE;
@@ -605,7 +616,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         List<OrderDetailFile> detailFiles = fileOrderDetailMapper.getIdCj(installCJDetailFile);
         for (OrderDetailFile file:detailFiles){
             // 工单号， file的id即附件表的id,uuid统一值
-            // path未准备上传被忽略
+            // path未准备上传被忽略 过程中这样写的接着向下执行别的同步表
             if (StringUtils.isEmpty(file.getFilePath())){
                 return Boolean.TRUE;
             }
@@ -819,8 +830,9 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             item.setPgwcmxid(pgwcmxid);
             item.updateById();
         }
-        // 采集表与采集条码表ID超范围 - 采集表及采集明细表中的outid统一修改
+        // 采集表与采集条码表ID超范围 - 采集表及采集条码明细表中的outid统一修改
         upOutId(item);
+
         // 采集标志 1100:保存,1110:作废,1120:转结算
         Integer cjstat = 1100;
         if (orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode()) ||
@@ -916,7 +928,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         List<OrderInstallDetail> upList = new ArrayList<>();
         List<OrderInstallDetail> detaillist = orderInstallDetailService.lambdaQuery()
                 .eq(OrderInstallDetail::getOrderBaseId, detail.getOrderBaseId())
-                .eq(OrderInstallDetail::getOutId,0).list();
+                .list();
         // 找出最大的序 默认值为0
         int outId=0;
         if (CollectionUtils.isNotEmpty(detaillist)){

src/main/resources/mapper/CodeOrderInstallDetailMapper.xml

@@ -72,6 +72,26 @@
             and a.order_base_id =  #{request.orderNo}
     </update>
 
+    <update id="updateCodeIncodePath" parameterType="com.zfire.jiasm.syncdata.parameter.InstalDetailCode">
+        update order_install_detail_code a,order_detail_file b set a.path=b.file_path,a.gree_image_id=b.brand_file_path
+        where a.order_base_id=b.order_base_id
+          and a.order_detail_id=b.order_detail_id
+          and a.type=b.file_type
+          and a.type=1
+          and a.status=1
+          and a.order_base_id  #{request.orderNo}
+    </update>
+
+    <update id="updateCodeOutcodePath" parameterType="com.zfire.jiasm.syncdata.parameter.InstalDetailCode">
+        update order_install_detail_code a,order_detail_file b set a.path=b.file_path,a.gree_image_id=b.brand_file_path
+        where a.order_base_id=b.order_base_id
+          and a.order_detail_id=b.order_detail_id
+          and a.type=b.file_type-1
+          and a.type=2
+          and a.status=1
+          and a.order_base_id =  #{request.orderNo}
+    </update>
+
 
 
 </mapper>