健辉v1.0

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

@@ -4,9 +4,14 @@ import com.malk.jianhui.config.KDWebApiConf;
 import com.malk.jianhui.service.JianhuiService;
 import com.malk.server.common.McR;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 @RestController
 public class JianhuiController {
 
@@ -16,11 +21,70 @@ public class JianhuiController {
     @Autowired
     private KDWebApiConf kdWebApiConf;
 
-    @GetMapping("/test")
-    public McR test() {
+    //新增销售订单
+    @PostMapping("/saveSaleOrder")
+    public McR saveSaleOrder(@RequestBody Map map) {
+        return jianhuiService.saveSaleOrder(map);
+    }
+
+    //新增预测单
+    @PostMapping("/saveForecastOrder")
+    public McR saveForecastOrder(@RequestBody Map map) {
+        return jianhuiService.saveForecastOrder(map);
+    }
+
+    //新增不良品处理单
+    @PostMapping("/saveDefectiveOrder")
+    public McR saveDefectiveOrder(@RequestBody Map map) {
+        return jianhuiService.saveDefectiveOrder(map);
+    }
 
-        return jianhuiService.savePurchaseOrder();
+    //定时同步客户
+    @GetMapping("/syncCustomers")
+    public McR syncCustomers(){
+        return jianhuiService.syncCustomers();
     }
 
+    //定时同步业务员
+    @GetMapping("/syncSalesman")
+    public McR syncSalesman(){
+        return jianhuiService.syncSalesman();
+    }
+
+    //定时同步物料
+    @GetMapping("/syncMaterial")
+    public McR syncMaterial(){
+        return jianhuiService.syncMaterial();
+    }
+
+    //定时同步供应商
+    @GetMapping("/syncSupplier")
+    public McR syncSupplier(){
+        return jianhuiService.syncSupplier();
+    }
+
+    //金蝶同步采购订单 每半小时同步一次
+    @Scheduled(cron = "0 0/30 * * * ?")
+    @GetMapping("/syncPurchaseOrder")
+    public McR syncPurchaseOrder() {
+        return jianhuiService.syncPurchaseOrder();
+    }
+
+    //审核采购订单
+    @PostMapping("/auditPurchaseOrder")
+    public McR auditPurchaseOrder(@RequestBody Map map) {
+        return jianhuiService.auditPurchaseOrder(map);
+    }
+
+    //每天0点同步所有数据
+    @Scheduled(cron = "0 0 0 * * ?")
+    @GetMapping("/syncData")
+    public McR syncData(){
+        return jianhuiService.syncData();
+    }
+
+
+
+
 
 }

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

@@ -0,0 +1,26 @@
+package com.malk.jianhui.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Audit {
+    private int CreateOrgId;
+
+    private List<String> Numbers;
+
+    private String Ids;
+
+    private String InterationFlags;
+
+    private int UseOrgId;
+
+    private String NetworkCtrl;
+
+    private Boolean IsVerifyProcInst;
+
+    private String IgnoreInterationFlag;
+
+    private Boolean UseBatControlTimes;
+}

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

@@ -0,0 +1,18 @@
+package com.malk.jianhui.entity;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class BillQuery {
+    private String FormId;
+    private String FieldKeys;
+    private List<Map> FilterString;
+    private String OrderString;
+    private int TopRowCount;
+    private int StartRow;
+    private int Limit;
+    private String SubSystemId;
+}

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

@@ -4,5 +4,12 @@ import lombok.Data;
 
 @Data
 public class BillTypeID {
+    public BillTypeID(String FNUMBER) {
+        this.FNUMBER = FNUMBER;
+    }
+
+    public BillTypeID() {
+    }
+
     private String FNUMBER;
 }

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

@@ -0,0 +1,19 @@
+package com.malk.jianhui.entity;
+
+import lombok.Data;
+
+@Data
+public class DefectEntity {
+    //物料id
+    private FNumber FMateridlId;
+    //供应商
+    private FNumber FSupplierId;
+    //单位
+    private FNumber FUnitID;
+    //不良处理
+    private String FDefProcess;
+    //不良数量
+    private double FDefectiveQty;
+    //使用决策备注
+    private String FMemo;
+}

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

@@ -0,0 +1,63 @@
+package com.malk.jianhui.entity;
+
+import lombok.Data;
+
+@Data
+public class ForecastEntity {
+    //供应组织
+    private FNumber FSupplyOrgId;
+    //客户id
+    private FNumber FCustID;
+    //产品类型
+    private String FProductType;
+    //物料id
+    private FNumber FMaterialID;
+    //单位id
+    private FNumber FUnitID;
+    //数量
+    private double FQty;
+    //预测开始日期
+    private String FStartDate;
+    //预测结束日期
+    private String FEndDate;
+    //基础单位id
+    private FNumber FBaseUnitID;
+    //基础数量
+    private double FBaseQty;
+    //基础订单数量
+    private double FBaseOrderQty;
+    //基础核销数量
+    private double FBaseWriteOffQty;
+    //基础选配数量
+    private double FBaseSelPrdQty;
+    //均化类型
+    private String FAVERATYPE;
+    //均化周期
+    private int FAveraCycle;
+    //库存组织id
+    private FNumber FStockOrgId;
+    //货主类型
+    private String FOwnerTypeId;
+    //货主id
+    private FNumber FOwnerId;
+    //预留类型
+    private String FReserveType;
+    //需求优先级
+    private int FPriority;
+    //核销数量
+    private double FWriteOffQty;
+    //订单数量
+    private double FOrderQty;
+    //选配数量
+    private double FSelPrdQty;
+    //备注
+    private String FRemark;
+    //是否MRP
+    private boolean FIsMRP;
+    //BOM条目id
+    private int FBomEntryId;
+    //是否MRP计算
+    private boolean FISMRPCAL;
+    //变更标识
+    private String FChangeFlag;
+}

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

@@ -3,14 +3,20 @@ package com.malk.jianhui.entity;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Objects;
 
 @Data
 public class Model {
     private int FID;
-    private BillTypeID FBillTypeID;
-    private String FDate;
-    private FNumber FSaleOrgId;
-    private FNumber FCustId;
+    private BillTypeID FBillTypeID;//单据类型
+    private String FDate;//日期
+    private String FBusinessType;//业务类型
+    private FNumber FSaleOrgId;//销售组织
+    private FNumber FForeOrgId;//预测组织
+    private FNumber FSourceOrgId;//来源组织
+    private FNumber FInspectOrgId;//质检组织
+    private FNumber FInspectDepId;//质检部门
+    private FNumber FCustId;//客户
     private FNumber FReceiveId;
     private FNumber FSaleDeptId;
     private FNumber FSalerId;
@@ -25,6 +31,9 @@ public class Model {
     private int FXPKID_H;
     private boolean FIsUseDrpSalePOPush;
     private boolean FIsCreateStraightOutIN;
+    private String FNote;//备注
+    private String FDescription;//备注
     private SaleOrderFinance SaleOrderFinance;
-    private List<SaleOrderEntry> FSaleOrderEntry;
+    private List<SaleOrderEntry> FSaleOrderEntry;//销售明细
+    private List<Object> FEntity;//明细
 }

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

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class SaleOrder {
+public class Save {
         private List<String> NeedUpDateFields;
         private List<String> NeedReturnFields;
         private boolean IsDeleteEntry = true;

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

@@ -18,5 +18,5 @@ public class Submit {
 
     private Boolean NetworkCtrl;
 
-    private Boolean  IgnoreInterationFlag;
+    private Boolean IgnoreInterationFlag;
 }

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

@@ -0,0 +1,14 @@
+package com.malk.jianhui.entity;
+
+import lombok.Data;
+
+@Data
+public class View {
+    private int CreateOrgId;
+
+    private String Number;
+
+    private String Id;
+
+    private Boolean IsSortBySeq;
+}

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

@@ -2,7 +2,27 @@ package com.malk.jianhui.service;
 
 import com.malk.server.common.McR;
 
+import java.util.Map;
+
 public interface JianhuiService {
-    McR savePurchaseOrder();
+    McR saveSaleOrder(Map map);
+
+    McR syncCustomers();
+
+    McR syncSalesman();
+
+    McR syncMaterial();
+
+    McR saveForecastOrder(Map map);
+
+    McR saveDefectiveOrder(Map map);
+
+    McR syncSupplier();
+
+    McR syncPurchaseOrder();
+
+    McR auditPurchaseOrder(Map map);
+
+    McR syncData();
 
 }

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

@@ -13,17 +13,17 @@ logging:
 
 # dingtalk
 dingtalk:
-  agentId:
-  appKey:
-  appSecret:
-  corpId:
+  agentId: 3366214854
+  appKey: dingntvkzjzxdx8h2m1s
+  appSecret: YfaV5mYOL4F--P8P_G9aD8DP_a8_IgM6dBILsSaTb4LeUZYSntacol55O1tJuqcU
+  corpId: ding923faa53d9d45937acaaa37764f94726
   aesKey:
   token:
   operator: 344749020127590108
 
 aliwork:
-  appType:
-  systemToken:
+  appType: APP_XPPVVMG6HA0GNDPJV4C1
+  systemToken: 8R7668D1P92RSNTS7OKZG5UR9P333QA7GAJ4MTG
 
 #测试环境
 kingdee:

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

@@ -13,15 +13,15 @@ logging:
 
 # dingtalk
 dingtalk:
-  agentId:
-  appKey:
-  appSecret:
-  corpId:
+  agentId: 3366214854
+  appKey: dingntvkzjzxdx8h2m1s
+  appSecret: YfaV5mYOL4F--P8P_G9aD8DP_a8_IgM6dBILsSaTb4LeUZYSntacol55O1tJuqcU
+  corpId: ding923faa53d9d45937acaaa37764f94726
   aesKey:
   token:
   operator: 344749020127590108
 
 aliwork:
-  appType:
-  systemToken:
+  appType: APP_XPPVVMG6HA0GNDPJV4C1
+  systemToken: 8R7668D1P92RSNTS7OKZG5UR9P333QA7GAJ4MTG
 

mjava-jianhui/src/main/resources/kdwebapi.properties

@@ -1,5 +0,0 @@
-X-KDApi-AcctID =674fb46c1143b6
-X-KDApi-AppID=298516_1YdCQ8FK0loe1a0FT+Rt1xzvzMW8TPpo
-X-KDApi-AppSec =c722304cc9b64e5fb1bce4717e8434c8
-X-KDApi-UserName =Administrator
-X-KDApi-ServerUrl=http://60.204.140.168:8689/k3cloud/