健辉v1.0

mjava-jianhui/src/main/java/com/malk/jianhui/controller/JianhuiController.java

@@ -63,6 +63,12 @@ public class JianhuiController {
         return jianhuiService.syncSupplier();
     }
 
+    //定时同步销售价目表
+    @GetMapping("/syncSalePrice")
+    public McR syncSalePrice(){
+        return jianhuiService.syncSalePrice();
+    }
+
     //金蝶同步采购订单 每半小时同步一次
     @Scheduled(cron = "0 0/30 * * * ?")
     @GetMapping("/syncPurchaseOrder")

mjava-jianhui/src/main/java/com/malk/jianhui/entity/Model.java

@@ -10,6 +10,7 @@ public class Model {
     private int FID;
     private BillTypeID FBillTypeID;//单据类型
     private String FDate;//日期
+    private String F_WMVJ_Date_qtr;//要货日期
     private String FBusinessType;//业务类型
     private FNumber FSaleOrgId;//销售组织
     private FNumber FForeOrgId;//预测组织
@@ -33,7 +34,7 @@ public class Model {
     private boolean FIsCreateStraightOutIN;
     private String FNote;//备注
     private String FDescription;//备注
-    private SaleOrderFinance SaleOrderFinance;
+    private SaleOrderFinance FSaleOrderFinance;
     private List<SaleOrderEntry> FSaleOrderEntry;//销售明细
     private List<Object> FEntity;//明细
 }

mjava-jianhui/src/main/java/com/malk/jianhui/entity/SaleOrderEntry.java

@@ -1,5 +1,7 @@
 package com.malk.jianhui.entity;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
@@ -8,22 +10,22 @@ public class SaleOrderEntry {
     private FNumber FUnitID;
     private double FQty;
     private FNumber FPriceUnitId;
-    private double FPriceUnitQty;
-    private double FPrice;
+//    private double FPriceUnitQty;
+//    private double FPrice;
     private double FTaxPrice;
     private boolean FIsFree;
     private double FEntryTaxRate;
-    private double FTaxAmount_LC;
+    /*private double FTaxAmount_LC;
     private double FAmount_LC;
-    private double FAllAmount_LC;
+    private double FAllAmount_LC;*/
     private String FDeliveryDate;
-    private FNumber FStockFNumber;
+    /*private FNumber FStockFNumber;
     private FNumber FSettleOrgIds;
     private String FOwnerTypeId;
-    private FNumber FOwnerId;
+    private FNumber FOwnerId;*/
     private String FEntryNote;
-    private double F_WMVJ_Decimal;
+/*    private double F_WMVJ_Decimal;
     private double F_WMVJ_Amount;
     private double F_WMVJ_Qty;
-    private boolean F_WMVJ_CheckBox;
+    private boolean F_WMVJ_CheckBox;*/
 }

mjava-jianhui/src/main/java/com/malk/jianhui/entity/SaleOrderFinance.java

@@ -7,10 +7,10 @@ public class SaleOrderFinance {
     private FNumber FSettleCurrId;
     private boolean FIsIncludedTax;
     private boolean FIsPriceExcludeTax;
-    private FNumber FExchangeTypeId;
+    /*private FNumber FExchangeTypeId;
     private double FMarginLevel;
     private double FMargin;
     private boolean FOverOrgTransDirect;
     private double FAllDisCount;
-    private int FXPKID_F;
+    private int FXPKID_F;*/
 }

mjava-jianhui/src/main/java/com/malk/jianhui/entity/Save.java

@@ -6,18 +6,21 @@ import java.util.List;
 
 @Data
 public class Save {
-        private List<String> NeedUpDateFields;
+        //默认为空 需要时选择性赋值
+/*        private List<String> NeedUpDateFields;
         private List<String> NeedReturnFields;
-        private boolean IsDeleteEntry = true;
+        private boolean IsDeleteEntry;
         private String SubSystemId;
-        private boolean IsVerifyBaseDataField = false;
-        private boolean IsEntryBatchFill = true;
-        private boolean ValidateFlag = true;
-        private boolean NumberSearch = true;
-        private boolean IsAutoAdjustField = true;
+        private boolean IsVerifyBaseDataField;
+        private boolean IsEntryBatchFill;
+        private boolean ValidateFlag;
+        private boolean NumberSearch;
+        private boolean IsAutoAdjustField;
         private String InterationFlags;
-        private String IgnoreInterationFlag;
-        private boolean IsControlPrecision = false;
-        private boolean ValidateRepeatJson = false;
+        private boolean IgnoreInterationFlag;
+        private boolean IsControlPrecision;
+        private boolean ValidateRepeatJson;*/
+
+        //保存实体
         private Model Model;
 }

mjava-jianhui/src/main/java/com/malk/jianhui/service/JianhuiService.java

@@ -25,4 +25,5 @@ public interface JianhuiService {
 
     McR syncData();
 
+    McR syncSalePrice();
 }

mjava-jianhui/src/main/resources/application-dev.yml

@@ -1,3 +1,4 @@
+#测试学习
 server:
   port: 9030
   servlet:

mjava-jianhui/src/main/resources/application-dev2.yml

@@ -0,0 +1,49 @@
+#钉钉测试
+server:
+  port: 9030
+  servlet:
+    context-path: /jianhui
+
+enable:
+  scheduling: false
+logging:
+  config: classpath:logback-spring.xml
+  path: /home/server/jianhui/log/
+  level:
+    com.malk.*: debug
+
+# dingtalk
+dingtalk:
+  agentId: 3366214854
+  appKey: dingntvkzjzxdx8h2m1s
+  appSecret: YfaV5mYOL4F--P8P_G9aD8DP_a8_IgM6dBILsSaTb4LeUZYSntacol55O1tJuqcU
+  corpId: ding923faa53d9d45937acaaa37764f94726
+  aesKey:
+  token:
+  operator: 344749020127590108
+
+aliwork:
+  appType: APP_XPPVVMG6HA0GNDPJV4C1
+  systemToken: 8R7668D1P92RSNTS7OKZG5UR9P333QA7GAJ4MTG
+
+#测试环境
+kingdee:
+# 第三方系统登录授权的账套ID
+  X-KDApi-AcctID: 67adb125bcb53e
+  # 第三方系统登录授权的用户
+  X-KDApi-UserName: Administrator
+  # 第三方系统登录授权的应用ID
+  X-KDApi-AppID: 303494_XZ8JQZuu3mnb49Xu3+XDzd+NzNx7wANv
+  # 第三方系统登录授权的应用密钥
+  X-KDApi-AppSec: 9ba984bc11a14bf1883e23ac223cc733
+  # 服务Url地址(公有云统一走网关sdk底层已处理，无需传X-KDApi-ServerUrl,下面这行需要注释)
+  X-KDApi-ServerUrl: http://60.204.140.168:8689/k3cloud/
+  # 账套语系，默认2052
+  # X-KDApi-LCID: 2052
+  # 组织编码，启用多组织时配置对应的组织编码才有效
+  # X-KDApi-OrgNum: 100
+  # 允许的最大连接延时，单位为秒
+  # X-KDApi-ConnectTimeout: 120
+  # 允许的最大读取延时，单位为秒
+  # X-KDApi-RequestTimeout: 120
+

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

@@ -1,3 +1,4 @@
+#钉钉测试
 server:
   port: 9030
   servlet:
@@ -25,3 +26,24 @@ aliwork:
   appType: APP_XPPVVMG6HA0GNDPJV4C1
   systemToken: 8R7668D1P92RSNTS7OKZG5UR9P333QA7GAJ4MTG
 
+#正式环境 健辉2025数据中心
+kingdee:
+  # 第三方系统登录授权的账套ID
+  X-KDApi-AcctID: 673ea92df26677
+  # 第三方系统登录授权的用户
+  X-KDApi-UserName: Administrator
+  # 第三方系统登录授权的应用ID
+  X-KDApi-AppID: 305150_x30vQZtv6MC8WU8JSZ1tSc1E4j1X3KoJ
+  # 第三方系统登录授权的应用密钥
+  X-KDApi-AppSec: 4361c400674e44948e45c0335c6af6e4
+  # 服务Url地址(公有云统一走网关sdk底层已处理，无需传X-KDApi-ServerUrl,下面这行需要注释)
+  X-KDApi-ServerUrl: http://60.204.140.168:8689/k3cloud/
+  # 账套语系，默认2052
+  # X-KDApi-LCID: 2052
+  # 组织编码，启用多组织时配置对应的组织编码才有效
+  # X-KDApi-OrgNum: 100
+  # 允许的最大连接延时，单位为秒
+  # X-KDApi-ConnectTimeout: 120
+  # 允许的最大读取延时，单位为秒
+  # X-KDApi-RequestTimeout: 120
+

mjava-jianhui/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: prod
   servlet:
     multipart:
       max-file-size: 100MB