add

src/main/java/com/zfire/jiasm/syncdata/parameter/InstalDetailCode.java

@@ -17,4 +17,6 @@ public class InstalDetailCode {
 
     // 格力总部-工单pgguid
     private String pgguId;
+
+    private String tmguid;
 }

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

@@ -188,7 +188,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                 ojtutls = outJiasmToGreeUploadTaskListService.lambdaQuery()
                         .eq(OutJiasmToGreeUploadTaskList::getSynStatus,0)
                         .eq(OutJiasmToGreeUploadTaskList::getUploadTaskType,uploadTaskType)
-                        // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,22843) // 测试用
+                        // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,24157) // 测试用
                         .lt(OutJiasmToGreeUploadTaskList::getSynTimes,10)
                         .orderByAsc(OutJiasmToGreeUploadTaskList::getSynReqId).list();
                 for (OutJiasmToGreeUploadTaskList ojtutl:ojtutls){
@@ -507,11 +507,100 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
 
             // 修改采集明细的序 pgwcmxid(自生成) 生成格力总部-采集明细序号
             upPgwcmxid(ojtutl);
+
+            // 采集条码表中的pgguid 统一改成工单基础表的pgguid,tmguid自生成
+            upOrderInstallDetailCodePgguid(ojtutl, orderBase);
+
+            // 上传附件表图片信息
+            uploadOrderDetailFile(ojtutl, CategoryRefmap, orderBase);
+
+            // 管理端采集的条码图并没全部给到采集条码表中，这里需要转移到采集条码表中
+            List<OrderInstallDetail> details = orderInstallDetailService.lambdaQuery()
+                    .eq(OrderInstallDetail::getOrderBaseId, orderBase.getId()).list();
+            for (OrderInstallDetail detail:details){
+                orderBaseInstallCjOrWgService.upCodep(detail);
+            }
         }
 
         return orderBaseInstallProc(brand, ojtutl, CategoryRefmap, orderBase);
     }
 
+    private void uploadOrderDetailFile(@NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) {
+        String oldFile ="";
+        String newFile ="";
+        // 根据产品类别名称 生成不同的完工明细数据
+        String mainName = CategoryRefmap.get(orderBase.getMainId()).get(0).getRefDictName();
+        InstallCJDetailFile installCJDetailFile = new InstallCJDetailFile();
+        List<OrderDetailFile> detailFiles = new ArrayList<>();
+        installCJDetailFile.setOrderNo(ojtutl.getId());
+        detailFiles = orderDetailFileService.lambdaQuery()
+                .eq(OrderDetailFile::getOrderBaseId, ojtutl.getId())
+                .isNull(OrderDetailFile::getBrandFilePath).list();
+        for (OrderDetailFile file:detailFiles){
+            // 工单号， file的id即附件表的id,uuid统一值
+            // path未准备上传被忽略
+            if (StringUtils.isEmpty(file.getFilePath())){
+                continue;
+            }
+            // 品牌方fileindex未获取上传被忽略
+            if (StringUtils.isEmpty(file.getBrandFilePath())){
+                // 上传图片
+                oldFile = IdWorker.getIdStr() + ".jpeg";
+                baseService.saveToFile(ossUtil.getUrlWw(file.getFilePath()),oldFile);
+                // 获取文件
+                newFile = oldFile;
+                WebsitFWS websitFWS = publicService.shshwdToptshwd(orderBase.getWebsitId(), orderBase);
+                Boolean flag = uploadFileexc(newFile, oldFile,websitFWS.getWebsitId(), file);
+                new File(newFile).delete();
+                if (!flag) {
+                    continue;
+                }
+            }
+            // 提取获取采集明细表数据中获取pgwcmxid(生成格力总部-采集明细序号)
+            OrderInstallDetail detailone = orderInstallDetailService.lambdaQuery()
+                    .eq(OrderInstallDetail::getOrderBaseId,file.getOrderBaseId())
+                    .eq(OrderInstallDetail::getId,file.getOrderDetailId())
+                    .last("limit 1")
+                    .one();
+
+            // 修改附件的pgwcmxid
+            if (detailone != null){
+                OrderDetailFile upf = new OrderDetailFile();
+                upf.setId(file.getId());
+                upf.setPgwcmxid(detailone.getPgwcmxid());
+                orderDetailFileService.updateById(upf);
+            }
+            // 采集附件表中的pgguid 统一改成工单基础表的pgguid 可以不用，从主表取即可 无pgguid字段
+            InstallCJDetailFile upfile = new InstallCJDetailFile();
+            upfile.setOrderNo(file.getOrderBaseId());
+            upfile.setPgguId(orderBase.getPgguid());
+            fileOrderDetailMapper.updateFilePgguid(upfile);
+
+
+            // 修改附件的fjguid
+            if (detailone != null && StringUtils.isEmpty(file.getFjguid())){
+                OrderDetailFile upf = new OrderDetailFile();
+                upf.setId(file.getId());
+                upf.setFjguid(UUID.randomUUID().toString());
+                orderDetailFileService.updateById(upf);
+            }
+        }
+    }
+
+    private void upOrderInstallDetailCodePgguid(@NotNull OutJiasmToGreeUploadTaskList ojtutl, OrderBase orderBase) {
+        List<OrderInstallDetailCode> oidcs = orderInstallDetailCodeService.lambdaQuery()
+                .eq(OrderInstallDetailCode::getOrderBaseId, ojtutl.getId())
+                .isNull(OrderInstallDetailCode::getPgguid)
+                .list();
+        if (CollectionUtils.isNotEmpty(oidcs)){
+            InstalDetailCode upcode = new InstalDetailCode();
+            upcode.setOrderNo(orderBase.getId());
+            upcode.setPgguId(orderBase.getPgguid());
+            upcode.setTmguid(UUID.randomUUID().toString());
+            codeOrderInstallDetailMapper.updateCodePgguid(upcode);
+        }
+    }
+
     private void upPgwcmxid(OutJiasmToGreeUploadTaskList ojtutl) {
         List<OrderInstallDetail> upList = new ArrayList<>();
         List<OrderInstallDetail> detaillist = orderInstallDetailService.lambdaQuery()
@@ -740,17 +829,18 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
             }
             if (StringUtils.isEmpty(code.getGreeImageId())){
                 // 上传图片
-                if (!uploadImage(orderBase, code)) {
+                /*if (!uploadImage(orderBase, code)) {
                     continue;
-                }
+                }*/
+                continue;
             }
 
-            if (StringUtils.isEmpty(code.getTmguid())){
+            /*if (StringUtils.isEmpty(code.getTmguid())){
                 OrderInstallDetailCode upCode = new OrderInstallDetailCode();
                 upCode.setId(code.getId());
                 upCode.setTmguid(UUID.randomUUID().toString());
                 orderInstallDetailCodeService.updateById(upCode);
-            }
+            }*/
             // 采集明细表中取pgwcmxid
             OrderInstallDetail orderInstallDetail = orderInstallDetailService.lambdaQuery()
                     .eq(OrderInstallDetail::getOrderBaseId,code.getOrderBaseId())
@@ -759,12 +849,12 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                     .one();
             if (orderInstallDetail == null || StringUtils.isEmpty(orderInstallDetail.getPgwcmxid())){
                 continue;
-            } else {
+            } /*else {
                 OrderInstallDetailCode upCode = new OrderInstallDetailCode();
                 upCode.setId(code.getId());
                 upCode.setPgwcmxid(orderInstallDetail.getPgwcmxid());
                 orderInstallDetailCodeService.updateById(upCode);
-            }
+            }*/
 
             // 生成采集条码表数据
             generateDetailCode(orderBase, code, mainName);
@@ -791,10 +881,10 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
 
     private void generateDetailCode(OrderBase orderBase, OrderInstallDetailCode code, String mainName) {
         // 采集条码表中的pgguid 统一改成工单基础表的pgguid
-        InstalDetailCode upcode = new InstalDetailCode();
+        /*InstalDetailCode upcode = new InstalDetailCode();
         upcode.setOrderNo(code.getOrderBaseId());
         upcode.setPgguId(orderBase.getPgguid());
-        codeOrderInstallDetailMapper.updateCodePgguid(upcode);
+        codeOrderInstallDetailMapper.updateCodePgguid(upcode);*/
 
         InstalDetailCode codep = new InstalDetailCode();
         codep.setOrderNo(code.getOrderBaseId());
@@ -944,7 +1034,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                 if (StringUtils.isEmpty(file.getFilePath())){
                     continue;
                 }
-                // 品牌方fileindex未获取上传被忽略
+                /*// 品牌方fileindex未获取上传被忽略
                 if (StringUtils.isEmpty(file.getBrandFilePath())){
                     // 上传图片
                     oldFile = IdWorker.getIdStr() + ".jpeg";
@@ -957,7 +1047,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                     if (!flag) {
                         continue;
                     }
-                }
+                }*/
                 // 提取获取采集明细表数据中获取pgwcmxid(生成格力总部-采集明细序号)
                 OrderInstallDetail detailone = orderInstallDetailService.lambdaQuery()
                         .eq(OrderInstallDetail::getOrderBaseId,file.getOrderBaseId())
@@ -1060,17 +1150,17 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
 
     public void getwgmxData(String mainName, OrderDetailFile file, OrderInstallDetail detailone) {
         // 修改附件的pgwcmxid
-        if (detailone != null){
+        /*if (detailone != null){
             OrderDetailFile upf = new OrderDetailFile();
             upf.setId(file.getId());
             upf.setPgwcmxid(detailone.getPgwcmxid());
             orderDetailFileService.updateById(upf);
         }
         // 采集附件表中的pgguid 统一改成工单基础表的pgguid 可以不用，从主表取即可 无pgguid字段
-        /*InstallCJDetailFile upfile = new InstallCJDetailFile();
+        InstallCJDetailFile upfile = new InstallCJDetailFile();
         upfile.setOrderNo(file.getOrderBaseId());
         upfile.setPgguId(orderBase.getPgguid());
-        fileOrderDetailMapper.updateFilePgguid(upfile);*/
+        fileOrderDetailMapper.updateFilePgguid(upfile);
 
 
         // 修改附件的fjguid
@@ -1080,6 +1170,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
             upf.setFjguid(UUID.randomUUID().toString());
             orderDetailFileService.updateById(upf);
         }
+        */
 
         InstallCJDetailFile request = new InstallCJDetailFile();
         request.setOrderNo(file.getOrderBaseId());

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

@@ -468,7 +468,8 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return Boolean.TRUE;
     }
 
-    private void upCodep(OrderInstallDetail detail) {
+    @Override
+    public void upCodep(OrderInstallDetail detail) {
         List<OrderInstallDetailCode> ucodes = new ArrayList<>();
         List<OrderInstallDetailCode> codes = orderInstallDetailCodeService.lambdaQuery()
         .eq(OrderInstallDetailCode::getOrderBaseId, detail.getOrderBaseId())

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

@@ -1,9 +1,6 @@
 package com.zfire.jiasm.syncdata.service;
 
-import com.zfire.jiasm.syncdata.plus.entity.Brand;
-import com.zfire.jiasm.syncdata.plus.entity.OrderBase;
-import com.zfire.jiasm.syncdata.plus.entity.OutJiasmToGreeUploadTaskList;
-import com.zfire.jiasm.syncdata.plus.entity.SysDictRef;
+import com.zfire.jiasm.syncdata.plus.entity.*;
 
 import java.util.List;
 import java.util.Map;
@@ -11,5 +8,6 @@ import java.util.Map;
 public interface orderBaseInstallCjOrWgService {
     void upOutId(String orderBaseId);
     Boolean orderBaseInstallCjOrWg(String cjOrWg, Brand brand, OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap);
+    void upCodep(OrderInstallDetail detail);
 
 }

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

@@ -30,8 +30,6 @@ public class RepairProduceDataUpload {
 
 
 
-
-
     @Scheduled(fixedDelayString = "${wxuploadysc}")
     private void produceList() throws Exception {
         if (wxuploadyscc.equals(TaskConfigEnum.FALSE.getCode())) {

src/main/resources/mapper/CodeOrderInstallDetailMapper.xml

@@ -13,7 +13,7 @@
     <select id="getJyCode" parameterType="com.zfire.jiasm.syncdata.parameter.InstalDetailCode" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblAzWgmxJyktTmmxUpload">
         select order_base_id as worker_order_no,out_id as fa_order_install_detail_code_id,tmguid, 'guangfo' as created_by,
                create_time as created_date,'guangfo' as last_modified_by,update_time as last_modified_date,pgwcmxid,
-               code as jqtm,type as tmlx,gree_image_id as scwj,gree_image_id as scid,password as kjmm,create_time as cjsj,
+               code as xjqtm,type as tmlx,gree_image_id as scwj,gree_image_id as scid,password as kjmm,create_time as cjsj,
                password2 as kjmm2, gree_image_id as imgpath
         from order_install_detail_code
             where order_base_id = #{request.orderNo} and id = #{request.id}
@@ -61,7 +61,7 @@
 
 
     <update id="updateCodePgguid" parameterType="com.zfire.jiasm.syncdata.parameter.InstalDetailCode">
-        update order_install_detail_code set pgguid = #{request.pgguId}
+        update order_install_detail_code set pgguid = #{request.pgguId},tmguid=#{request.tmguid}
         where order_base_id =  #{request.orderNo} and (pgguid is null or pgguid = '' or pgguid = '0');
     </update>
 

src/main/resources/mapper/FileOrderDetailMapper.xml

@@ -32,7 +32,7 @@
                'guangfo' as last_modified_by,a.update_time as last_modified_date,
             right(a.id,8) as fjindex,a.file_name as fjname,a.file_path as fjphonepath,a.file_remark as fjremark,
             a.sort_num as fjsequence,a.brand_file_path as fjserverpath,
-            a.pgwcmxid,a.create_time as reatetime,a.file_type
+            a.pgwcmxid,a.create_time as reatetime,a.file_type as type
         from order_detail_file a
             left join order_base b on b.id = a.order_base_id
             left join order_install_detail c on c.order_base_id = a.order_base_id and c.id = a.order_detail_id
@@ -45,7 +45,7 @@
                'guangfo' as last_modified_by,a.update_time as last_modified_date,
             right(a.id,8) as fjindex,a.file_name as fjname,a.file_path as fjphonepath,a.file_remark as fjremark,
             a.sort_num as fjsequence,a.brand_file_path as fjserverpath,
-            a.pgwcmxid,a.create_time as reatetime,a.file_type
+            a.pgwcmxid,a.create_time as reatetime,a.file_type as type
         from order_detail_file a
             left join order_base b on b.id = a.order_base_id
             left join order_install_detail c on c.order_base_id = a.order_base_id and c.id = a.order_detail_id
@@ -58,7 +58,7 @@
                'guangfo' as last_modified_by,a.update_time as last_modified_date,
                right(a.id,8) as fjindex,a.file_name as fjname,a.file_path as fjphonepath,a.file_remark as fjremark,
                a.sort_num as fjsequence,a.brand_file_path as fjserverpath,
-               a.create_time as reatetime,a.file_type
+               a.create_time as reatetime,a.file_type as type
         from order_detail_file a
                  left join order_base b on b.id = a.order_base_id
                  left join order_install_detail c on c.order_base_id = a.order_base_id and c.id = a.order_detail_id
@@ -71,7 +71,7 @@
                'guangfo' as last_modified_by,a.update_time as last_modified_date,
                right(a.id,8) as fjindex,a.file_name as fjname,a.file_path as fjphonepath,a.file_remark as fjremark,
                a.sort_num as fjsequence,a.brand_file_path as fjserverpath,
-               a.create_time as reatetime,a.file_type
+               a.create_time as reatetime,a.file_type as type
         from order_detail_file a
                  left join order_base b on b.id = a.order_base_id
                  left join order_install_detail c on c.order_base_id = a.order_base_id and c.id = a.order_detail_id
@@ -110,7 +110,7 @@
             right(a.id,8) as fjindex,a.file_name as fjname,a.file_path as fjphonepath,a.file_remark as fjremark,
             a.sort_num as fjsequence,a.brand_file_path as fjserverpath,
             a.pgwcmxid,a.create_time as reatetime,
-            a.file_type
+            a.file_type as type
         from order_detail_file a
             left join order_base b on b.id = a.order_base_id
             left join order_install_detail c on c.order_base_id = a.order_base_id and c.id = a.order_detail_id
@@ -123,7 +123,7 @@
                'guangfo' as last_modified_by,a.update_time as last_modified_date,
             right(a.id,8) as fjindex,a.file_name as fjname,a.file_path as fjphonepath,a.file_remark as fjremark,
             a.sort_num as fjsequence,a.brand_file_path as fjserverpath,
-            a.create_time as reatetime,a.file_type
+            a.create_time as reatetime,a.file_type as type
         from order_detail_file a
             left join order_base b on b.id = a.order_base_id
             left join order_install_detail c on c.order_base_id = a.order_base_id and c.id = a.order_detail_id
@@ -136,7 +136,7 @@
                'guangfo' as last_modified_by,a.update_time as last_modified_date,
             right(a.id,8) as fjindex,a.file_name as fjname,a.file_path as fjphonepath,a.file_remark as fjremark,
             a.sort_num as fjsequence,a.brand_file_path as fjserverpath,
-            a.create_time as reatetime,a.file_type
+            a.create_time as reatetime,a.file_type as type
         from order_detail_file a
             left join order_base b on b.id = a.order_base_id
             left join order_install_detail c on c.order_base_id = a.order_base_id and c.id = a.order_detail_id