11.3代码提交

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

@@ -82,7 +82,7 @@ public class KdYdCustomerController {
     @Autowired
     private HuaGaoService huaGaoService;
     @PostMapping("/test")
-    public McR sendGroupMsg(@RequestBody JSONObject param) {
+    public McR sendGroupMsg(@RequestBody JSONObject param) throws Exception {
         log.info("推送消息:{}", param);
 //        MDC.put("MDC_KEY_PID", "1002");
 //        McException.assertParamException_Null(param, "msgParam", "msgKey", "openConversationId", "robotCode", "coolAppCode");
@@ -112,10 +112,44 @@ public class KdYdCustomerController {
 //                        .build(),
 //                YDConf.FORM_OPERATION.multi_update
 //        );
+        K3CloudApi client = new K3CloudApi(initIden());
 
+        int startRow = 0;
+        int limit = 2000;
 
-//        LocalDateTime startTime = LocalDate.of(2026, 10, 13).atStartOfDay();
-//        LocalDateTime endTime = LocalDate.of(2026, 10, 14).atStartOfDay();
+        BillQuery billQuery = new BillQuery();
+
+        billQuery.setLimit(limit);
+        billQuery.setFormId("BD_SerialMainFile");
+        billQuery.setFieldKeys("FNumber,FMaterialID.FNumber,FMaterialID.FName,FMaterialID.FSpecification,FMaterialID.F_QUXZ_Assistant,FZKTS,FStockStatus,FStockId.FName,FStockLocID.FF100001.FName,FCustId.FName");
+        List<Map> filterString = new ArrayList<>();
+        //仓库等于成品仓 仓位等于默认仓位或样机仓位 在库状态等于待入库或在库
+        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockId.FName","67","成品仓","","","0"));//仓库名称等于XX
+        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockLocId.FF100001.FName","67","默认仓位","(","","0"));//仓位等于XX
+        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockLocId.FF100001.FName","67","讯飞皆成","","","1"));//仓位等于XX
+        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockLocId.FF100001.FName","67","讯飞天津租赁","","","1"));//仓位等于XX
+        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockLocId.FF100001.FName","67","讯飞知学","","","1"));//仓位等于XX
+        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockLocId.FF100001.FName","67","物流成品发货","","","1"));//仓位等于XX
+        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockLocId.FF100001.FName","67","样机仓位","",")","1"));//仓位等于XX
+        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockStatus","29","0","(","","0"));//在库状态等于XX
+        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockStatus","29","1","",")","1"));//在库状态等于XX
+
+        billQuery.setFilterString(filterString);
+
+        List<Map> result = new ArrayList<>();
+        List<Map> list = new ArrayList<>();
+
+        do {
+            billQuery.setStartRow(startRow);
+            String s = client.billQuery(JSONObject.toJSONString(billQuery));
+            result = (List<Map>)JSONObject.parse(s);
+            list.addAll(result);
+
+            startRow += limit;
+        }while (result.size() == limit);
+        System.out.println(list.size());
+//        LocalDateTime startTime = LocalDate.of(2026, 10, 27).atStartOfDay();
+//        LocalDateTime endTime = LocalDate.of(2026, 10, 28 ).atStartOfDay();
 //        List<String> time = Arrays.asList(String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(startTime)), String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(endTime)));
 //        try {
 //            huaGaoService.syncKqData(startTime, endTime);

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

@@ -149,10 +149,14 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
             List<Map> filterString = new ArrayList<>();
             //仓库等于成品仓 仓位等于默认仓位或样机仓位 在库状态等于待入库或在库
             filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockId.FName","67","成品仓","","","0"));//仓库名称等于XX
-            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockLocId.FF100001.FName","67","默认仓位","(","","1"));//仓位等于XX
-            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockLocId.FF100001.FName","67","样机仓位","",")","0"));//仓位等于XX
-            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockStatus","29","0","(","","1"));//在库状态等于XX
-            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockStatus","29","1","",")","0"));//在库状态等于XX
+            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockLocId.FF100001.FName","67","默认仓位","(","","0"));//仓位等于XX
+            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockLocId.FF100001.FName","67","讯飞皆成","","","1"));//仓位等于XX
+            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockLocId.FF100001.FName","67","讯飞天津租赁","","","1"));//仓位等于XX
+            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockLocId.FF100001.FName","67","讯飞知学","","","1"));//仓位等于XX
+            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockLocId.FF100001.FName","67","物流成品发货","","","1"));//仓位等于XX
+            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockLocId.FF100001.FName","67","样机仓位","",")","1"));//仓位等于XX
+            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockStatus","29","0","(","","0"));//在库状态等于XX
+            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockStatus","29","1","",")","1"));//在库状态等于XX
 
             billQuery.setFilterString(filterString);
 

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

@@ -167,6 +167,7 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
             String bzfs = UtilMap.getString(formData, "selectField_mf6a0h5y");
             String hqdmb = UtilMap.getString(formData, "selectField_mg4hjsig");
             String bz = UtilMap.getString(formData, "textareaField_mejnamfb");
+            String  sfsd= UtilMap.getString(formData, "radioField_mvyu6x2h");
 //            String ckddh = UtilMap.getString(formData, "textField_mqg2b2g5");
 //            LocalDateTime hhsj = parseTimestamp(UtilMap.getString(formData, "dateField_mf6a0h67"));
             LocalDateTime hhsj = Optional.ofNullable(
@@ -252,6 +253,7 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
             deliveryData.put("rq", rq);
 //            deliveryData.put("ckddh", ckddh);
             deliveryData.put("kh", kh);
+            deliveryData.put("sfsd", sfsd);
             deliveryData.put("jsbb", jsbb);
             deliveryData.put("djbh", djbh);
             deliveryData.put("xsbm", xsbm);

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

@@ -1979,14 +1979,14 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
                                         "DateField",
                                         YDSearch.Type.DATE_FIELD,
                                         YDSearch.Operator.LE
+                                ),
+                                new YDSearch(
+                                        "radioField_mvypcg33",
+                                        "否",
+                                        "RadioField",
+                                        YDSearch.Type.RADIO_FIELD,
+                                        YDSearch.Operator.EQ
                                 )
-//                                new YDSearch(
-//                                        "radioField_mru0o7u6",
-//                                        "是",
-//                                        "RadioField",
-//                                        YDSearch.Type.RADIO_FIELD,
-//                                        YDSearch.Operator.EQ
-//                                )
                         )))
                         .build()
         );

mjava-huagao/src/test/java/com/malk/huagao/EqbTest.java

@@ -52,7 +52,6 @@ public class EqbTest {
         // e签宝接口调用域名（正式环境）
         String host = "https://openapi.esign.cn";
 
-
         //步骤1：上传本地文件并转成HTML格式
         //1.1获取文件上传地址
 //        getFileUploadUrl(appId,appKey,host);
@@ -62,7 +61,7 @@ public class EqbTest {
 //        getFileInfo(appId,appKey,host,"1c2ede25c6454ad4af8bcba3dd9beb35");
 
         //步骤3：获取制作合同模板页面链接
-        getDocCreateUrl(appId,appKey,host,"418d535ab69f4c1fbe01931b8b74f82f");
+//        getDocCreateUrl(appId,appKey,host,"418d535ab69f4c1fbe01931b8b74f82f");
 
         //测试环境模板id ef7d3bcee4254e67944d53db6a1f76eb
 

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

@@ -4166,11 +4166,11 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
         List<McInvoiceDto> result = invoices.stream().map(item -> {
             Map prop = UtilMap.getMap(UtilMap.getMap(item, "SingleInvoiceInfos"), UtilMap.getString(item, "SubType"));
             String no = UtilMap.getString(prop, "Number");
-            if ("OtherInvoice".equals(UtilMap.getString(item, "SubType")) && StringUtils.isBlank(no)) {
-                log.info("忽略无发票号码的 OCR 非票据内容: subType={}, description={}",
-                        UtilMap.getString(item, "SubType"), UtilMap.getString(item, "SubTypeDescription"));
-                return null;
-            }
+//            if ("OtherInvoice".equals(UtilMap.getString(item, "SubType")) && StringUtils.isBlank(no)) {
+//                log.info("忽略无发票号码的 OCR 非票据内容: subType={}, description={}",
+//                        UtilMap.getString(item, "SubType"), UtilMap.getString(item, "SubTypeDescription"));
+//                return null;
+//            }
             String taxRate = null;
 //            List<Map<String, Object>> vatInvoiceItemInfos = UtilMap.getList(prop, "VatInvoiceItemInfos");
             // 优先使用 VatInvoiceItemInfos，如果为空则使用 VatElectronicItems