9.23代码提交

mjava-huagao/src/main/java/com/malk/huagao/controller/HuaGaoController.java

@@ -9,6 +9,7 @@ import com.malk.server.common.McException;
 import com.malk.server.common.McR;
 import com.malk.service.aliwork.YDClient;
 import com.malk.service.dingtalk.DDClient;
+import com.malk.utils.UtilDateTime;
 import com.malk.utils.UtilMap;
 import com.malk.utils.UtilServlet;
 import lombok.SneakyThrows;
@@ -17,6 +18,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -26,6 +31,8 @@ import java.util.Map;
 public class HuaGaoController {
     @Autowired
     private HuaGaoService huaGaoService;
+    @Autowired
+    private YDClient ydClient;
 
     @GetMapping("/test")
     public McR test() {
@@ -65,4 +72,24 @@ public class HuaGaoController {
         return McR.success();
     }
 
+    @PostMapping("/updateWorkHours1")
+    McR updateWorkHours1(@RequestBody Map map) {
+        log.info("考勤同步-周度");
+        LocalDateTime startTime = LocalDate.now().minusWeeks(1).atTime(LocalTime.MIN);
+        LocalDateTime endTime = LocalDate.now().atTime(LocalTime.MIN);
+        List<String> time = Arrays.asList(String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(startTime)), String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(endTime)));
+        try {
+            huaGaoService.syncKqData(startTime, endTime);
+            compSave(time, "同步成功", "");
+        } catch (Exception e) {
+            e.printStackTrace();
+            compSave(time, "异常", e.getMessage());
+        }
+        return McR.success();
+    }
+    private void compSave(List<String> time, String result, String msg) {
+        ydClient.operateData(YDParam.builder().formUuid("FORM-0D560B9D8B64464C8C885FE20B7C7C95T4IA")
+                .formDataJson(JSON.toJSONString(UtilMap.map("cascadeDateField_m8nud6sy, selectField_m8nud6t3, textField_m8nud6t9, textareaField_m8nud6tb", time, "已完成", result, msg)))
+                .build(), YDConf.FORM_OPERATION.create);
+    }
 }

mjava-huagao/src/main/java/com/malk/huagao/controller/KdYdCustomerController.java

@@ -5,6 +5,10 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.kingdee.bos.webapi.entity.IdentifyInfo;
+import com.kingdee.bos.webapi.sdk.K3CloudApi;
+import com.malk.huagao.KdEntity.BillQuery;
+import com.malk.huagao.config.KDWebApiConf;
 import com.malk.huagao.service.IKdYdCustomerService;
 import com.malk.huagao.service.IKdYdZpService;
 import com.malk.huagao.service.KdHuaGaoService;
@@ -74,16 +78,82 @@ public class KdYdCustomerController {
     private YDService ydService;
     @Autowired
     private KdHuaGaoService kdHuaGaoService;
+    @Autowired
+    private KDWebApiConf kdWebApiConf;
     @PostMapping("/test")
     public McR sendGroupMsg(@RequestBody JSONObject param) {
         log.info("推送消息:{}", param);
+        MDC.put("MDC_KEY_PID", "1002");
 //        McException.assertParamException_Null(param, "msgParam", "msgKey", "openConversationId", "robotCode", "coolAppCode");
 //        Map map = ddClientExtension.sendGroupMessages(ddClient.getAccessToken(), param.getJSONObject("msgParam"), param.getString("msgKey"), param.getString("openConversationId")
 //                , param.getString("robotCode"), param.getString("coolAppCode"));
 //        kdHuaGaoService.syncPendingProducts();
 //        ydHuaGaoService.synckdlrgh();
+        kdHuaGaoService.syncDLVNotice(null);
+//        String formInstId = param.getString("formInstId");
+//        ydClient.operateData(YDParam.builder()
+//                .formInstId(formInstId)
+//                .useLatestVersion(true)
+//                .updateFormDataJson("{}").build(), YDConf.FORM_OPERATION.update);
+
+//        try {
+//            K3CloudApi client = new K3CloudApi(initIden());
+//
+//            int startRow = 0;
+//            int limit = 2;
+//
+//            BillQuery billQuery = new BillQuery();
+//
+//            billQuery.setLimit(limit);
+//            billQuery.setFormId("SAL_DELIVERYNOTICE");
+//            billQuery.setFieldKeys("FBillNo,FDate,FCustomerID.FName,F_QUXZ_Assistant.FNumber,FEntity_FEntryID,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FJX,FMaterialId.FSpecification,FMaterialId.F_QUXZ_Assistant,FUnitID.FName,FQty,FIsFree,FHGZBDay.FNumber,FStockID.FName");
+//            List<Map> filterString = new ArrayList<>();
+//            //审核日期为昨日到现在且单据状态等于已审核且明细收件人电话不为空
+//            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","265",1,"","","0"));//审核日期在今天之前XX天之后
+//            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FDocumentStatus","105","C","","","0"));//单据状态等于XX
+////        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FHGReceiveDZ","52","","","","0"));//明细收件人地址不为空
+//            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FHGReceiveDh","52","","","","0"));//明细收件人电话不为空
+////        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","420","2025-01-01","","","0"));//审核日期等于XX年
+////        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","63","","","","0"));//审核日期等于本月
+//
+//            billQuery.setFilterString(filterString);
+//
+//            List<Map> result = new ArrayList<>();
+//            List<Map> list = new ArrayList<>();
+//
+//            do {
+//                billQuery.setStartRow(startRow);
+//
+//                result = (List<Map>)JSONObject.parse(client.billQuery(JSONObject.toJSONString(billQuery)));
+//
+//                list.addAll(result);
+//
+//                startRow += limit;
+//            }while (result.size() == limit);
+//            System.out.println("list = " + list);
+//            for (Map map : list) {
+//                Map formData = new HashMap();
+//                String fBillNo = UtilMap.getString(map, "FBillNo");
+//
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
         return McR.success();
     }
+    private IdentifyInfo initIden(){
+        //注意 1：此处不再使用参数形式传入用户名及密码等敏感信息，改为在登录配置文件中设置。
+        //注意 2：必须先配置第三方系统登录授权信息后，再进行业务操作，详情参考各语言版本SDK介绍中的登录配置文件说明。
+        //读取配置，初始化SDK
+        IdentifyInfo iden = new IdentifyInfo();
+        iden.setUserName(kdWebApiConf.getXKDApiUserName());
+        iden.setAppId(kdWebApiConf.getXKDApiAppID());
+        iden.setdCID(kdWebApiConf.getXKDApiAcctID());
+        iden.setAppSecret(kdWebApiConf.getXKDApiAppSec());
+        iden.setServerUrl(kdWebApiConf.getXKDApiServerUrl());
+
+        return iden;
+    }
     @PostMapping("/test35")
     McR test21(@RequestBody Map data) {
         MDC.put("MDC_KEY_PID", "1003");

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdHuaGaoServiceImpl.java

@@ -826,15 +826,17 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
 
             billQuery.setLimit(limit);
             billQuery.setFormId("SAL_DELIVERYNOTICE");
-            billQuery.setFieldKeys("FBillNo,FDate,FCustomerID.FName,F_QUXZ_Assistant.FNumber,FEntity_FEntryID,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FSpecification,FMaterialId.F_QUXZ_Assistant,FUnitID.FName,FQty,FIsFree,FHGZBDay.FNumber,FStockID.FName");
+            billQuery.setFieldKeys("FBillNo,FDate,FCustomerID.FName,F_QUXZ_Assistant.FNumber,FMaterialId.FJX,FEntity_FEntryID,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FSpecification,FMaterialId.F_QUXZ_Assistant,FUnitID.FName,FQty,FIsFree,FHGZBDay.FNumber,FStockID.FName");
             List<Map> filterString = new ArrayList<>();
             //审核日期为昨日到现在且单据状态等于已审核且明细收件人电话不为空
-            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","265",1,"","","0"));//审核日期在今天之前XX天之后
+            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","265",51,"","","0"));//审核日期在今天之前XX天之后
             filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FDocumentStatus","105","C","","","0"));//单据状态等于XX
 //        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FHGReceiveDZ","52","","","","0"));//明细收件人地址不为空
             filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FHGReceiveDh","52","","","","0"));//明细收件人电话不为空
 //        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","420","2025-01-01","","","0"));//审核日期等于XX年
 //        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","63","","","","0"));//审核日期等于本月
+//        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","39","2026-09-11","","","0"));//审核日期大于等于
+//        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","16","2026-09-19","","","0"));//审核日期小于等于
 
             billQuery.setFilterString(filterString);
 
@@ -852,6 +854,11 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
             }while (result.size() == limit);
 
             for (Map map : list) {
+                // ========== 关键：先判断机型/物料属性 ==========
+                String fMaterialFJX = UtilMap.getString(map, "FMaterialId.FJX");
+                if ("销售耗材".equals(fMaterialFJX)) {
+                    continue;  // 等于"销售耗材"，跳过本条，继续循环下一条
+                }
                 Map formData = new HashMap();
                 String fBillNo = UtilMap.getString(map, "FBillNo");
                 formData.put("textField_mfqf1fj5", fBillNo);//单据编号
@@ -890,7 +897,7 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
                 formData.put("textField_mfqf1fj7", UtilMap.getString(map,"FMaterialId.FNumber"));//物料编码
                 formData.put("textField_mfqf1fj8", UtilMap.getString(map,"FMaterialId.FName"));//物料名称
                 formData.put("textField_mfqf1fj9", UtilMap.getString(map,"FMaterialId.FSpecification"));//物料规格
-                formData.put("textField_mfqf1fk3", UtilMap.getString(map,"FMaterialId.F_QUXZ_Assistant"));//所属系列
+                formData.put("textField_mfqf1fk3", UtilMap.getString(map,"FMaterialId.FJX"));//机型
                 formData.put("textField_mfqf1fjb", UtilMap.getString(map,"FUnitID.FName"));//销售单位
                 formData.put("numberField_mfqf1fjd", UtilMap.getDouble(map,"FQty"));//销售数量
                 formData.put("textField_mfqf1fjh", UtilMap.getBoolean(map,"FIsFree") ? "是" : "否");//是否赠品

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdCustomerServiceImpl.java

@@ -52,7 +52,7 @@ public class KdYdCustomerServiceImpl extends ServiceImpl<KdYdCustomerMapper, KdY
     private String kdHost;
 
     @Override
-    public Map<String, Object> insertCustomer(Map map) {
+    public Map<String, Object>  insertCustomer(Map map) {
         Map<String, Object> result = new HashMap<>();
 
         try {

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdDeliveryServiceImpl.java

@@ -62,16 +62,19 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
             String formInstId = UtilMap.getString(map, "formInstId");
             String action = UtilMap.getString(map, "type");
 
-            // 处理特殊操作类型
             // 处理特殊操作类型
             if ("del".equals(action)) {
                 String bm = UtilMap.getString(map, "bm");
 
-                int maxRetries = 3;
+                int maxRetries = 5;                    // 增加重试次数到 5 次
                 boolean success = false;
                 String lastResponse = "";
+                String lastCode = "";
+                int retryCount = 0;
 
                 for (int i = 0; i < maxRetries; i++) {
+                    retryCount = i + 1;
+
                     Map<String, String> headers = new HashMap<>();
                     headers.put("Content-Type", "application/x-www-form-urlencoded");
                     Map<String, Object> formParams = new HashMap<>();
@@ -82,27 +85,47 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
                     String jsonStr = JSON.toJSONString(requestBody);
                     formParams.put("jsons", jsonStr);
 
-                    HttpResponse response = HttpRequest.post(kdHost + "/xk/dyzn/WsBasedyzn.asmx/hgdjydtbdeletefhtzd")
-                            .headerMap(headers, true)
-                            .form(formParams)
-                            .timeout(90000)
-                            .execute();
+                    try {
+                        HttpResponse response = HttpRequest.post(kdHost + "/xk/dyzn/WsBasedyzn.asmx/hgdjydtbdeletefhtzd")
+                                .headerMap(headers, true)
+                                .form(formParams)
+                                .timeout(90000)
+                                .execute();
+                        lastResponse = response.body();
+                    } catch (Exception e) {
+                        log.error("第{}次删除请求异常: {}", retryCount, e.getMessage(), e);
+                        lastResponse = "请求异常: " + e.getMessage();
+                    }
 
-                    lastResponse = response.body();
-                    log.info("第{}次删除返回值: {}", i + 1, lastResponse);
+                    // 解析状态码
+                    lastCode = parseCode(lastResponse);
+                    log.info("第{}次删除返回值[code={}]: {}", retryCount, lastCode, lastResponse);
 
-                    if (lastResponse != null && lastResponse.contains("\"code\":200")) {
+                    // 判断是否成功
+                    if ("200".equals(lastCode)) {
                         success = true;
                         break;
                     }
 
+                    // 失败则继续重试
                     if (i < maxRetries - 1) {
+                        long delay;
+                        if ("300".equals(lastCode)) {
+                            // 反审核失败，等待更长时间
+                            delay = 3000L + (i * 2000L); // 3s, 5s, 7s, 9s
+                            log.info("反审核失败(code=300)，等待 {} 秒后第 {} 次重试", delay / 1000, i + 2);
+                        } else {
+                            // 其他错误，正常等待
+                            delay = 2000L + (i * 1000L);
+                            log.info("删除失败(code={})，等待 {} 秒后第 {} 次重试", lastCode, delay / 1000, i + 2);
+                        }
+
                         try {
-                            long delay = 2000 + (i * 1000);
-                            log.info("等待 {} 秒后重试", delay / 1000);
                             Thread.sleep(delay);
                         } catch (InterruptedException e) {
                             Thread.currentThread().interrupt();
+                            log.warn("重试等待被中断");
+                            break;
                         }
                     }
                 }
@@ -112,9 +135,13 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
                 Map<String, Object> dataMap = new HashMap<>();
                 dataMap.put("bm", bm);
                 dataMap.put("msg", success ? "删除成功" : "删除失败，已重试" + maxRetries + "次");
+
+                // 仅在失败时追加错误信息，成功时保持原有结构
                 if (!success) {
+                    dataMap.put("lastCode", lastCode);
                     dataMap.put("error", lastResponse);
                 }
+
                 result.put("data", dataMap);
                 return result;
             }
@@ -182,6 +209,8 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
                     String kddh = safeGetString(item, "textField_mf6a0h6w");
                     String mdh = safeGetString(item, "textField_mf6a0h6y");
                     String sku = safeGetString(item, "textField_mqg2b2g6");
+                    String ck = safeGetString(item, "selectField_mucdojz5");
+                    String cw = safeGetString(item, "selectField_mucdojz6");
                     String skuh = safeGetString(item, "textField_mqg2p1zi");
                     String xfckdh = safeGetString(item, "textField_mqg2b2g5");
                     LocalDateTime yhrq = parseTimestamp(safeGetString(item, "dateField_mejnamfo"));
@@ -190,6 +219,8 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
                     table1Map.put("detailId", detailId);
                     table1Map.put("wlmc", wlmc);
                     table1Map.put("sku", sku);
+                    table1Map.put("ck", ck);
+                    table1Map.put("cw", cw);
                     table1Map.put("skuh", skuh);
                     table1Map.put("ggxh", ggxh);
                     table1Map.put("xsdw", xsdw);
@@ -773,4 +804,23 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
         }
         return false;
     }
+
+    /**
+     * 从响应中解析 code 值
+     */
+    private String parseCode(String response) {
+        if (response == null || response.isEmpty()) {
+            return "empty";
+        }
+        try {
+            java.util.regex.Pattern pattern = java.util.regex.Pattern.compile("\"code\"\\s*:\\s*(\\d+)");
+            java.util.regex.Matcher matcher = pattern.matcher(response);
+            if (matcher.find()) {
+                return matcher.group(1);
+            }
+        } catch (Exception e) {
+            log.warn("解析状态码失败: {}", e.getMessage());
+        }
+        return "unknown";
+    }
 }

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdMaterialServiceImpl.java

@@ -220,6 +220,8 @@ public class KdYdMaterialServiceImpl extends ServiceImpl<KdYdMaterialMapper, KdY
                     String ssxl = safeGetStringValue(kdYdMaterial, "ssxl");
                     String jx = safeGetStringValue(kdYdMaterial, "jx");
                     String sku = safeGetStringValue(kdYdMaterial, "sku");
+                    String ck = safeGetStringValue(kdYdMaterial, "ck");
+                    String cw = safeGetStringValue(kdYdMaterial, "cw");
 
                     // 修复：安全处理sd字段
                     Object sdObj = kdYdMaterial.get("sd");
@@ -296,6 +298,8 @@ public class KdYdMaterialServiceImpl extends ServiceImpl<KdYdMaterialMapper, KdY
                     updateFormData.put("textField_mhabp7y0", sdbb);
                     updateFormData.put("textField_mfxbtcdr", chlb);
                     updateFormData.put("textField_mfxbtce5", xsy);
+                    updateFormData.put("textField_muc4363t", ck);
+                    updateFormData.put("textField_muc4363u", cw);
 
                     // 确保金额字段保留两位小数
                     if (xsjzj != null) {

mjava-huagao/src/main/resources/application-prod.yml

@@ -73,7 +73,7 @@ eqb:
 
 #金蝶方开发服务
 kd:
-  host: http://172.16.24.173:70
+  host: http://172.16.24.159:70
 
 qcc:
 #  app-key: dcc6bcfcb0044118a4dbc4cceeea5c3f

mjava-huagao/src/main/resources/application-prod2.yml

@@ -74,7 +74,7 @@ eqb:
 
 #金蝶方开发服务
 kd:
-  host: http://172.16.24.173:70
+  host: http://172.16.24.159:70
 
 qcc:
   app-key: dcc6bcfcb0044118a4dbc4cceeea5c3f

mjava-lilin/src/main/java/com/malk/lilin/Service/impl/LiLinServiceImpl.java

@@ -901,7 +901,7 @@ public class LiLinServiceImpl implements LiLinService {
                 "1001260509300325413"
         );
 //        List<String> khdaList = Arrays.asList(
-//                 "1001260509024819590"
+//                 "1001260509424880696"
 //        );
         // 获取 token 一次
         String securityCode;
@@ -932,8 +932,8 @@ public class LiLinServiceImpl implements LiLinService {
                 String dayFromId = LocalDate.now().minusDays(8).format(DateTimeFormatter.ofPattern("yyyyMMdd"));
                 String dayToId = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
                 // 准备时间范围
-//                String dayFromId = LocalDate.of(2026, 4, 9).format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-//                String dayToId = LocalDate.of(2026, 4, 9).format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+//                String dayFromId = LocalDate.of(2026, 7, 8).format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+//                String dayToId = LocalDate.of(2026, 7, 13).format(DateTimeFormatter.ofPattern("yyyyMMdd"));
 
                 // ========== 分页查询 ==========
                 int pageSize = 20;

mjava-qiwang/src/main/java/com/malk/qiwang/Controller/QiWangController.java

@@ -90,17 +90,22 @@ public class QiWangController {
         String businessId = (String) processInstance.get("businessId");
         System.out.println(businessId);
 //
-//        if (Objects.nonNull(processInstance)) {
-//            List<Map> formComponentValues = (List<Map>) processInstance.get("formComponentValues");
-//            System.out.println("formComponentValues====" + formComponentValues);
+        if (Objects.nonNull(processInstance)) {
+            List<Map> formComponentValues = (List<Map>) processInstance.get("formComponentValues");
+            System.out.println("formComponentValues====" + formComponentValues);
 
             // 存储所有处理结果
 //            List<Object> allResults = new ArrayList<>();
 //
 //            // 遍历所有表单组件
-//            for (Map formComponentValue : formComponentValues) {
-//                String id = String.valueOf(formComponentValue.get("id"));
-//
+            String zh = "";
+            for (Map formComponentValue : formComponentValues) {
+                String id = String.valueOf(formComponentValue.get("id"));
+                Object value = formComponentValue.get("value");
+                if ("RecipientAccountField_13CHMZZOTK4G0".equals(id)) {
+                    zh = value != null ? String.valueOf(value) : "";
+                }
+
 //                // 查找 TableField_1A1CDMEN8DDS0 组件
 //                if ("TableField_1A1CDMEN8DDS0".equals(id)) {
 //                    String tableFieldValue = String.valueOf(formComponentValue.get("value"));
@@ -137,12 +142,13 @@ public class QiWangController {
 //                }
 //            }
 
-            // 处理完所有附件后，汇总结果
+                // 处理完所有附件后，汇总结果
 
 //                return McR.success() ;
 //
 //        }
-
+            }
+            System.out.println("id:=== " + ", value: " + zh);}
         return McR.success();
     }
     @PostMapping ("/test3")

mjava-qiwang/src/main/java/com/malk/qiwang/Service/impl/InvoiceLibraryServiceImpl.java

@@ -135,7 +135,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
             String fkzhxx = null;
             String fkzh = null;
             String yhqc = null;
-//            String sfct = null;
+            String skzh = null;
             BigDecimal mainJe = null;
 
             // 遍历收集主表字段值
@@ -155,6 +155,9 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
                         }
                     }
                 }
+                if ("RecipientAccountField_1FGFBO5HL1PC0".equals(id)) {
+                    skzh = value != null ? String.valueOf(value) : "";
+                }
                 if ("DDSelectField_1TP75OVCPAAO0".equals(id)) {
                     bxlb = value != null ? String.valueOf(value) : "";
                 }
@@ -265,6 +268,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
                                 // 保存基础报销记录（无发票）
                                 InvoiceLibrary baseInvoice = new InvoiceLibrary();
                                 baseInvoice.setOaId(processInstanceId);
+                                baseInvoice.setSkzh(skzh);
                                 baseInvoice.setBusinessId(businessId);
                                 baseInvoice.setOaStatus("0");
                                 baseInvoice.setInvoiceStatus("0");
@@ -557,6 +561,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
 
                             InvoiceLibrary invoiceLibrary = new InvoiceLibrary();
                             invoiceLibrary.setOaId(processInstanceId);
+                            invoiceLibrary.setSkzh(skzh);
                             invoiceLibrary.setBusinessId(businessId);
                             invoiceLibrary.setInvoiceCode(invoice.getString("code") != null ? invoice.getString("code") : "");
                             invoiceLibrary.setInvoiceNumber(invoice.getString("serial") != null ? invoice.getString("serial") : "");
@@ -648,6 +653,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
 
                                     InvoiceLibrary sharedInvoice = new InvoiceLibrary();
                                     sharedInvoice.setOaId(processInstanceId);
+                                    sharedInvoice.setSkzh(skzh);
                                     sharedInvoice.setBusinessId(businessId);
                                     sharedInvoice.setOaStatus("0");
                                     sharedInvoice.setInvoiceStatus("0");
@@ -1120,7 +1126,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
             String fkzhxx = null;
             String fkzh = null;
             String yhqc = null;
-//            String sfct = null;
+            String skzh = null;
             BigDecimal mainJe = null;
 
             // 遍历收集主表字段值
@@ -1140,6 +1146,9 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
                         }
                     }
                 }
+                if ("RecipientAccountField_1U3QZJI8H6RK0".equals(id)) {
+                    skzh = value != null ? String.valueOf(value) : "";
+                }
                 if ("DDSelectField_YLLB7AD1ATS0".equals(id)) {
                     bxlb = value != null ? String.valueOf(value) : "";
                 }
@@ -1250,6 +1259,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
                                 // 保存基础报销记录（无发票）
                                 InvoiceLibrary baseInvoice = new InvoiceLibrary();
                                 baseInvoice.setOaId(processInstanceId);
+                                baseInvoice.setSkzh(skzh);
                                 baseInvoice.setBusinessId(businessId);
                                 baseInvoice.setOaStatus("0");
                                 baseInvoice.setInvoiceStatus("0");
@@ -1542,6 +1552,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
 
                             InvoiceLibrary invoiceLibrary = new InvoiceLibrary();
                             invoiceLibrary.setOaId(processInstanceId);
+                            invoiceLibrary.setSkzh(skzh);
                             invoiceLibrary.setBusinessId(businessId);
                             invoiceLibrary.setInvoiceCode(invoice.getString("code") != null ? invoice.getString("code") : "");
                             invoiceLibrary.setInvoiceNumber(invoice.getString("serial") != null ? invoice.getString("serial") : "");
@@ -1633,6 +1644,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
 
                                     InvoiceLibrary sharedInvoice = new InvoiceLibrary();
                                     sharedInvoice.setOaId(processInstanceId);
+                                    sharedInvoice.setSkzh(skzh);
                                     sharedInvoice.setBusinessId(businessId);
                                     sharedInvoice.setOaStatus("0");
                                     sharedInvoice.setInvoiceStatus("0");
@@ -1749,6 +1761,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
             String fkzhxx = null;
             String fkzh = null;
             String yhqc = null;
+            String skzh = null;
             BigDecimal mainJe = null;
 
             // 遍历收集主表字段值
@@ -1777,6 +1790,9 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
                 if ("DDSelectField_1WEX2WWCJ3PC0".equals(id)) {
                     fkzhxx = value != null ? String.valueOf(value) : "";
                 }
+                if ("RecipientAccountField_13CHMZZOTK4G0".equals(id)) {
+                    skzh = value != null ? String.valueOf(value) : "";
+                }
                 if ("TextField_2W39FPCZH1A0".equals(id)) {
                     fkzh = value != null ? String.valueOf(value) : "";
                 }
@@ -1878,6 +1894,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
                                 // 保存基础报销记录（无发票）
                                 InvoiceLibrary baseInvoice = new InvoiceLibrary();
                                 baseInvoice.setOaId(processInstanceId);
+                                baseInvoice.setSkzh(skzh);
                                 baseInvoice.setBusinessId(businessId);
                                 baseInvoice.setOaStatus("0");
                                 baseInvoice.setInvoiceStatus("0");
@@ -2170,6 +2187,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
 
                             InvoiceLibrary invoiceLibrary = new InvoiceLibrary();
                             invoiceLibrary.setOaId(processInstanceId);
+                            invoiceLibrary.setSkzh(skzh);
                             invoiceLibrary.setBusinessId(businessId);
                             invoiceLibrary.setInvoiceCode(invoice.getString("code") != null ? invoice.getString("code") : "");
                             invoiceLibrary.setInvoiceNumber(invoice.getString("serial") != null ? invoice.getString("serial") : "");
@@ -2261,6 +2279,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
 
                                     InvoiceLibrary sharedInvoice = new InvoiceLibrary();
                                     sharedInvoice.setOaId(processInstanceId);
+                                    sharedInvoice.setSkzh(skzh);
                                     sharedInvoice.setBusinessId(businessId);
                                     sharedInvoice.setOaStatus("0");
                                     sharedInvoice.setInvoiceStatus("0");
@@ -2377,6 +2396,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
             String fkzhxx = null;
             String fkzh = null;
             String yhqc = null;
+            String skzh = null;
             BigDecimal mainJe = null;
 
             // 遍历收集主表字段值
@@ -2396,6 +2416,9 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
                         }
                     }
                 }
+                if ("RecipientAccountField_1J46MPCCTYZK0".equals(id)) {
+                    skzh = value != null ? String.valueOf(value) : "";
+                }
                 if ("DDSelectField_BS1HCMO7YTK0".equals(id)) {
                     bxlb = value != null ? String.valueOf(value) : "";
                 }
@@ -2506,6 +2529,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
                                 // 保存基础报销记录（无发票）
                                 InvoiceLibrary baseInvoice = new InvoiceLibrary();
                                 baseInvoice.setOaId(processInstanceId);
+                                baseInvoice.setSkzh(skzh);
                                 baseInvoice.setBusinessId(businessId);
                                 baseInvoice.setOaStatus("0");
                                 baseInvoice.setInvoiceStatus("0");
@@ -2798,6 +2822,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
 
                             InvoiceLibrary invoiceLibrary = new InvoiceLibrary();
                             invoiceLibrary.setOaId(processInstanceId);
+                            invoiceLibrary.setSkzh(skzh);
                             invoiceLibrary.setBusinessId(businessId);
                             invoiceLibrary.setInvoiceCode(invoice.getString("code") != null ? invoice.getString("code") : "");
                             invoiceLibrary.setInvoiceNumber(invoice.getString("serial") != null ? invoice.getString("serial") : "");
@@ -2889,6 +2914,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
 
                                     InvoiceLibrary sharedInvoice = new InvoiceLibrary();
                                     sharedInvoice.setOaId(processInstanceId);
+                                    sharedInvoice.setSkzh(skzh);
                                     sharedInvoice.setBusinessId(businessId);
                                     sharedInvoice.setOaStatus("0");
                                     sharedInvoice.setInvoiceStatus("0");
@@ -3006,6 +3032,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
             String fkzhxx = null;
             String fkzh = null;
             String yhqc = null;
+            String skzh = null;
             BigDecimal mainJe = null;
 
             // 遍历收集主表字段值
@@ -3025,6 +3052,9 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
                         }
                     }
                 }
+                if ("RecipientAccountField_1PNXMXLXIW000".equals(id)) {
+                    skzh = value != null ? String.valueOf(value) : "";
+                }
                 if ("DDSelectField_1UX0JVU89Q000".equals(id)) {
                     bxlb = value != null ? String.valueOf(value) : "";
                 }
@@ -3135,6 +3165,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
                                 // 保存基础报销记录（无发票）
                                 InvoiceLibrary baseInvoice = new InvoiceLibrary();
                                 baseInvoice.setOaId(processInstanceId);
+                                baseInvoice.setSkzh(skzh);
                                 baseInvoice.setBusinessId(businessId);
                                 baseInvoice.setOaStatus("0");
                                 baseInvoice.setInvoiceStatus("0");
@@ -3427,6 +3458,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
 
                             InvoiceLibrary invoiceLibrary = new InvoiceLibrary();
                             invoiceLibrary.setOaId(processInstanceId);
+                            invoiceLibrary.setSkzh(skzh);
                             invoiceLibrary.setBusinessId(businessId);
                             invoiceLibrary.setUserId(userId);
                             invoiceLibrary.setInvoiceCode(invoice.getString("code") != null ? invoice.getString("code") : "");
@@ -3518,6 +3550,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
 
                                     InvoiceLibrary sharedInvoice = new InvoiceLibrary();
                                     sharedInvoice.setOaId(processInstanceId);
+                                    sharedInvoice.setSkzh(skzh);
                                     sharedInvoice.setBusinessId(businessId);
                                     sharedInvoice.setOaStatus("0");
                                     sharedInvoice.setInvoiceStatus("0");

mjava-qiwang/src/main/java/com/malk/qiwang/entity/InvoiceLibrary.java

@@ -134,6 +134,9 @@ public class InvoiceLibrary implements Serializable {
 //    付款账号
     private String payAccount;
 
+    //收款账户
+    private String skzh;
+
     //银行全称
     private String bankName;