完善出库单

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java

@@ -15,18 +15,19 @@ import java.util.List;
 public class ApPayBill {
 
         @JsonProperty("FDATE")
-        @NotBlank
+        @NotBlank(message = "FDate不能为空")
         //业务日期:FDATE  (必填项)
         public String FDATE;
         @JsonProperty("FRECTUNIT")
-        @NotBlank
+        @NotBlank(message = "FRECTUNIT不能为空")
         //收款单位:FRECTUNIT  (必填项)
         public String FRECTUNIT ;
-        @NotBlank
+        @JsonProperty("FPURCHASEORGID")
+        @NotBlank(message = "FPURCHASEORGID不能为空")
         //采购组织:FPURCHASEORGID
         public String FPURCHASEORGID ;
         @JsonProperty("FPURCHASEDEPTID")
-        @NotBlank
+        @NotBlank(message = "FPURCHASEDEPTID不能为空")
         //采购部门:FPURCHASEDEPTID(必填项)
         public String FPURCHASEDEPTID ;
         /*@JsonProperty("F_PAEZ_Assistant")
@@ -37,13 +38,13 @@ public class ApPayBill {
          *  //应付类别:F_PAEZ_AssistantType  (必填项) 默认：005 定金
          */
         @JsonProperty("F_PAEZ_AssistantType")
-        @NotBlank
+        @NotBlank(message = "F_PAEZ_AssistantType不能为空")
         public String F_PAEZ_AssistantType;
         /**
          * //应付类别:F_PAEZ_AssistantKey  (必填项) 默认：005 定金
          */
         @JsonProperty("F_PAEZ_AssistantKey")
-        @NotBlank
+        @NotBlank(message = "F_PAEZ_AssistantKey不能为空")
         public String F_PAEZ_AssistantKey;
     /**
      * //备注:FREMARK
@@ -86,13 +87,13 @@ public class ApPayBill {
           * 结算方式:FSETTLETYPEIDKey  (必填项)
           */
          @JsonProperty("FSETTLETYPEIDKey")
-         @NotBlank
+         @NotBlank(message = "FSETTLETYPEIDKey不能为空")
          public String  FSETTLETYPEIDKey;
          /**
           * 结算方式:FSETTLETYPEIDType  (必填项)
           */
          @JsonProperty("FSETTLETYPEIDType")
-         @NotBlank
+         @NotBlank(message = "FSETTLETYPEIDType不能为空")
          public String  FSETTLETYPEIDType;
         //付款用途:FPURPOSEID  (必填项) SFKYT08_SYS：采购付款   SFKYT09_SYS：预付款
         /*@JsonProperty("FPURPOSEID")
@@ -102,24 +103,24 @@ public class ApPayBill {
           * 付款用途:FPURPOSEIDType  (必填项) SFKYT08_SYS：采购付款   SFKYT09_SYS：预付款
           */
         @JsonProperty("FPURPOSEIDType")
-        @NotBlank
+        @NotBlank(message = "FPURPOSEIDType不能为空")
         public String FPURPOSEIDType;
          /**
           * 付款用途:FPURPOSEIDKey  (必填项) SFKYT08_SYS：采购付款   SFKYT09_SYS：预付款
           */
          @JsonProperty("FPURPOSEIDKey")
-         @NotBlank
+         @NotBlank(message = "FPURPOSEIDKey不能为空")
          public String FPURPOSEIDKey;
         @JsonProperty("FPAYTOTALAMOUNTFOR")
-        @NotBlank
+        @NotBlank(message = "FPAYTOTALAMOUNTFOR不能为空")
         //表体-应付金额:FPAYTOTALAMOUNTFOR
         public double FPAYTOTALAMOUNTFOR;
          @JsonProperty("FACCOUNTID")
-         @NotBlank
+         @NotBlank(message = "FACCOUNTID不能为空")
          //我方银行账号:FACCOUNTID 第1行分录，银行业务的结算方式，我方银行相关信息必录
          public String FACCOUNTID;
          @JsonProperty("FPOSTDATE")
-         @NotBlank
+         @NotBlank(message = "FPOSTDATE不能为空")
          //登账日期:FPOSTDATE  (必填项)
          public String FPOSTDATE;
         /* @JsonProperty("FRuZhangType")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bank/BDBank.java

@@ -11,19 +11,19 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class BDBank {
    /* 创建组织:FCreateOrgId  (必填项)*/
-   @NotBlank
+   @NotBlank(message = "FCreateOrgId不能为空")
    @JsonProperty("FCreateOrgId")
     public String FCreateOrgId;
     /*名称:FName  (必填项)*/
-    @NotBlank
+    @NotBlank(message = "FName不能为空")
     @JsonProperty("FName")
     public String FName;
     /* 使用组织:FUseOrgId  (必填项)*/
-    @NotBlank
+    @NotBlank(message = "FUseOrgId不能为空")
     @JsonProperty("FUseOrgId")
     public String FUseOrgId;
     /* :FNumber  (必填项)*/
-    @NotBlank
+    @NotBlank(message = "FNumber不能为空")
     @JsonProperty("FNumber")
     public String FNumber;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdmaterial/BdMaterial.java

@@ -14,7 +14,7 @@ public class BdMaterial {
      * 目标组织:TOrgId
      */
     @JsonProperty("TOrgIds")
-    @NotBlank
+    @NotBlank(message = "TOrgIds不能为空")
     public String TOrgIds;
     /**
      * 旧的物料编码:oldFName

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdstock/BDStock.java

@@ -16,19 +16,19 @@ public class BDStock implements Serializable {
      * 创建组织:FCreateOrgId  (必填项)
      */
     @JsonProperty("FCreateOrgId")
-    @NotBlank
+    @NotBlank(message = "FCreateOrgId不能为空")
     private String FCreateOrgId;
     /**
      * 使用组织:FUseOrgId  (必填项)
      */
     @JsonProperty("FUseOrgId")
-    @NotBlank
+    @NotBlank(message = "FUseOrgId不能为空")
     private String FUseOrgId;
     /**
      * 名称:FName  (必填项)
      */
     @JsonProperty("FName")
-    @NotBlank
+    @NotBlank(message = "FName不能为空")
     private String FName;
     /**
      * 备注

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdsupplier/BdSupplier.java

@@ -9,7 +9,7 @@ import javax.validation.constraints.NotBlank;
 public class BdSupplier {
    /* 名称:FName  (必填项)*/
    @JsonProperty("FName")
-   @NotBlank
+   @NotBlank(message = "FName不能为空")
    public String FName;
    /* 创建组织:FCreateOrgId  (必填项)*/
   /* @JsonProperty("FCreateOrgId")
@@ -19,11 +19,11 @@ public class BdSupplier {
    public String FUseOrgId;*/
    /* 手机:FLocMobile  (必填项)*/
    @JsonProperty("FLocMobile")
-   @NotBlank
+   @NotBlank(message = "FLocMobile不能为空")
    public String FLocMobile;
     /* 使用组织机构:FUseOrgId  (必填项)*/
     @JsonProperty("FUseOrgId")
-    @NotBlank
+    @NotBlank(message = "FUseOrgId不能为空")
     public String  FUseOrgId;
     /* 目标组织机构:TOrgIds  (必填项)*/
  /*   @JsonProperty("TOrgIds")
@@ -44,7 +44,7 @@ public class BdSupplier {
     /**
      * 编号 FNumber
      */
-   @NotBlank
+   @NotBlank(message = "FNumber不能为空")
    @JsonProperty("FNumber")
    public String FNumber;
    public static BdSupplier bdSupplier=new BdSupplier();

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/cnbankcnt/CNBankacnt.java

@@ -11,27 +11,27 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class CNBankacnt {
     /*银行账号:FNumber  (必填项)*/
-    @NotBlank
+    @NotBlank(message = "FNumber不能为空")
     @JsonProperty("FNumber")
     public String FNumber;
     /*开户银行:FBANKID  (必填项)*/
-    @NotBlank
+    @NotBlank(message = "FBANKID不能为空")
     @JsonProperty("FBANKID")
     public String FBANKID;
     /*银行名称:bankName  (必填项)*/
-    @NotBlank
+    @NotBlank(message = "bankName不能为空")
     @JsonProperty("bankName")
     public String bankName;
     /*账户名称:FName  (必填项)*/
-    @NotBlank
+    @NotBlank(message = "FName不能为空")
     @JsonProperty("FName")
     public String FName;
     /*使用组织:FUseOrgId  (必填项)*/
-    @NotBlank
+    @NotBlank(message = "FUseOrgId不能为空")
     @JsonProperty("FUseOrgId")
     public String FUseOrgId;
     /*创建组织:FCreateOrgId  (必填项)*/
-    @NotBlank
+    @NotBlank(message = "FCreateOrgId不能为空")
     @JsonProperty("FCreateOrgId")
     public String FCreateOrgId;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/orgorganizations/OrgOrganizations.java

@@ -12,15 +12,15 @@ import javax.validation.constraints.NotBlank;
 public class OrgOrganizations {
     /*名称:FName  (必填项)*/
     @JsonProperty("FName")
-    @NotBlank
+    @NotBlank(message = "FName不能为空")
     public String FName;
     /*编码:FNumber  (必填项)*/
     @JsonProperty("FNumber")
-    @NotBlank
+    @NotBlank(message = "FNumber不能为空")
     public String FNumber;
     /*形态:FOrgFormID  (必填项)*/
     @JsonProperty("FOrgFormID")
-    @NotBlank
+    @NotBlank(message = "FOrgFormID不能为空")
     public String FOrgFormID;
     /*描述:FDescription*/
     @JsonProperty("FDescription")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/paezcllx/PaezCllx.java

@@ -14,24 +14,24 @@ public class PaezCllx {
          * 使用组织:FUseOrgId  (必填项)
          */
         @JsonProperty("FUseOrgId")
-        @NotBlank
+        @NotBlank(message = "FUseOrgId不能为空")
         public String FUseOrgId;
         /**
          * 创建组织:FCreateOrgId  (必填项)
          */
         @JsonProperty("FCreateOrgId")
-        @NotBlank
+        @NotBlank(message = "FCreateOrgId不能为空")
         public String FCreateOrgId;
         /**
          * 类型名称:FName  (必填项)
          */
         @JsonProperty("FName")
-        @NotBlank
+        @NotBlank(message = "FName不能为空")
         public String FName;
         /**
          * 类型编码:FNumber  (必填项)
          */
         @JsonProperty("FNumber")
-        @NotBlank
+        @NotBlank(message = "FNumber不能为空")
         public String FNumber;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/push/Push.java

@@ -26,13 +26,13 @@ public class Push {
     /**
      * 业务对象表单Id，字符串类型（必录） formid
      */
-    @NotBlank
+    @NotBlank@NotBlank(message = "formid不能为空")
     @JsonProperty("formid")
     private String formid;
     /**
      * 单据编码集合，数组类型，格式：[No1,No2,...]（使用编码时必录）:Numbers  (必填项)  单据编码
      */
-    @NotBlank
+    @NotBlank(message = "Numbers不能为空")
     @JsonProperty("Numbers")
     private String Numbers;
     /**
@@ -43,13 +43,13 @@ public class Push {
     /**
      * 转换规则内码，字符串类型（未启用默认转换规则时，则必录）:RuleId  (必填项)
      */
-    @NotBlank
+    @NotBlank(message = "RuleId不能为空")
     @JsonProperty("RuleId")
     private String RuleId;
     /**
      * 目标单据FormId，字符串类型，（启用默认转换规则时，则必录）:TargetFormId  (必填项)
      */
-    @NotBlank
+    @NotBlank(message = "TargetFormId不能为空")
     @JsonProperty("TargetFormId")
     private String TargetFormId;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java

@@ -18,12 +18,12 @@ public class StkInStock {
     /**
      *  //分配目标组织:TOrgId  (必填项)
      */@JsonProperty("TOrgId")
-    @NotBlank
+    @NotBlank(message = "TOrgId不能为空")
     public String TOrgId;
     /**
      *  //采购组织:FPurchaseOrgId  (必填项)
      */@JsonProperty("FPurchaseOrgId")
-    @NotBlank
+    @NotBlank(message = "FPurchaseOrgId不能为空")
     public String FPurchaseOrgId;
     /**
      * // 收料组织:FStockOrgId  (必填项)
@@ -34,19 +34,19 @@ public class StkInStock {
     /**
      *   // 采购部门:FPurchaseDeptId  (必填项)
      */@JsonProperty("FPurchaseDeptId")
-    @NotBlank
+    @NotBlank(message = "FPurchaseDeptId不能为空")
     public String FPurchaseDeptId;
 
     /**
      * // 供应商:FSupplierId  (必填项)
      */@JsonProperty("FSupplierId")
-    @NotBlank
+    @NotBlank(message = "FSupplierId不能为空")
     public String FSupplierId;
 
     /**
      *  // 入库日期:FDate  (必填项)
      */@JsonProperty("FDate")
-    @NotBlank
+    @NotBlank(message = "FDate不能为空")
     public String FDate;
 
     /**
@@ -83,26 +83,26 @@ public class StkInStock {
         /**
          * 物料分组
          */
-        @NotBlank
+        @NotBlank(message = "wlfz不能为空")
         public String wlfz;
        /* @NotBlank
         public String wlfzType;*/
         /**
          * 车辆类型
          */
-        @NotBlank
+        @NotBlank(message = "cllx不能为空")
         public String cllx;
-        @NotBlank
+        @NotBlank(message = "cllxType不能为空")
         public String cllxType;
         /**
          *  // 单价:FPrice
          */@JsonProperty("FPrice")
-        @NotBlank
+        @NotBlank(message = "FPrice不能为空")
         public String FPrice;
         /**
          *  // 物料编码:FMaterialId  (必填项)
          */@JsonProperty("FMaterialId")
-        @NotBlank
+        @NotBlank(message = "FMaterialId不能为空")
         public String FMaterialId;
 
         /**
@@ -132,13 +132,13 @@ public class StkInStock {
         /**
          *   //  批号:FLot
          */@JsonProperty("FLot")
-        @NotBlank
+        @NotBlank(message = "FLot不能为空")
         public String FLot;
 
         /**
          *   //  仓库:FStockId
          */@JsonProperty("FStockId")
-        @NotBlank
+        @NotBlank(message = "FStockId不能为空")
         public String FStockId;
         /**
          * 备注

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java

@@ -23,15 +23,15 @@ public class StkTransferDirect {
         public String FDestStockStatusId;*/
         /* 调入仓库 (必填项)*/
         @JsonProperty("FDestStockId")
-        @NotBlank
+        @NotBlank(message = "FDestStockId不能为空")
         public String FDestStockId;
         /* 物料编码:FMaterialId  (必填项)*/
         @JsonProperty("FMaterialId")
-        @NotBlank
+        @NotBlank(message = "FMaterialId不能为空")
         public String FMaterialId;
         /* 调出仓库:FSrcStockId  (必填项)*/
         @JsonProperty("FSrcStockId")
-        @NotBlank
+        @NotBlank(message = "FSrcStockId不能为空")
         public String FSrcStockId;
         /*调出库存状态:FSrcStockStatusId  (必填项)*/
        /* @JsonProperty("FSrcStockStatusId")
@@ -92,19 +92,19 @@ public class StkTransferDirect {
     }
     /* 调入货主:FOwnerIdHead  (必填项)*/
     @JsonProperty("FOwnerIdHead")
-    @NotBlank
+    @NotBlank(message = "FOwnerIdHead不能为空")
     public String FOwnerIdHead;
    /* 调出库存组织:FStockOutOrgId  (必填项)*/
     @JsonProperty("FStockOutOrgId")
-    @NotBlank
+    @NotBlank(message = "FStockOutOrgId不能为空")
     public String FStockOutOrgId;
     /* 调入库存组织:FStockOrgId  (必填项)*/
     @JsonProperty("FStockOrgId")
-    @NotBlank
+    @NotBlank(message = "FStockOrgId不能为空")
     public String FStockOrgId;
     /* 日期:FDate  (必填项)*/
     @JsonProperty("FDate")
-    @NotBlank
+    @NotBlank(message = "FDate不能为空")
     public String FDate;
     /**
      * 备注

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java

@@ -16,7 +16,7 @@ public class KingDeeConfig {
     /**
      * 登录金蝶的账户信息
      */
-    public static String userName = "信息部";
+    public static String userName = "信息部2";
     /**
      * 登录金蝶的账户信息
      */

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java

@@ -156,7 +156,23 @@ public class BdMaterialService extends FinKingDeeService {
             if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData());
             ResultBean<String> audit = audit(data);
             if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setData(audit.getData());
-            ResultBean<String> allocate = allocate(map_fEntityModel_.get("TOrgIds"), data);
+
+            String getKDForNumbers = getGetKDForNumbers(KingDeeBillId.ORG_ORGANIZATIONS.getID(), map_fEntityModel_.get("TOrgIds"));
+            ResultBean<String> kingDataInfoByNumber = accessKingDeeInterface(KingDeeBillId.ORG_ORGANIZATIONS.getID(), getKDForNumbers,
+                    KingDeeConfig.userName_administrator,KingDeeConfig.password_administrator,KingDeeBillUrl.VIEW_URL.getURL());
+            JSONObject jsonObject = JSONObject.parseObject(kingDataInfoByNumber.getData().toString());
+            JSONObject result2 = (JSONObject)jsonObject.get("Result");
+            JSONObject responseStatus = (JSONObject)result2.get("ResponseStatus");
+            if(responseStatus!=null){//不存在分公司 //新增分公司
+                return  rb.setCode(KingDeeCode.NOTEXIST.getCode()).setMsg(KingDeeCode.NOTEXIST.getMsg());
+            }
+            String vie_result =kingDataInfoByNumber.getData();
+            jsonObject = JSONObject.parseObject(vie_result);
+            JSONObject result3= (JSONObject)jsonObject.get("Result");
+            JSONObject Result2 = (JSONObject)result3.get("Result");
+            Integer Id = (Integer)Result2.get("Id");
+            String id= Id+"";
+            ResultBean<String> allocate = allocate(id, data);
             if (!allocate.getSuccess()) return rb.setCode(KingDeeCode.ALLOCATE.getCode()).setData(allocate.getData());
             return draft;
         } catch (Exception e) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java

@@ -1,8 +1,10 @@
 package com.yxt.anrui.fin.biz.kingdee.saloutstock;
 
+import com.alibaba.fastjson.JSONObject;
 import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
 import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
+import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
 import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
 import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQuery;
 import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo;
@@ -26,6 +28,30 @@ public class SalOutStockService extends FinKingDeeService {
     public ResultBean draftSalOutStock(SalOutStock salOutStock) {
        // salOutStock=SalOutStock.createSalOutStock();
         ResultBean rb=ResultBean.fireFail();
+       /* List<StkInStock.FInStockEntry> fInStockEntry1 = stkInStock.getFInStockEntry();
+        for (StkInStock.FInStockEntry f: fInStockEntry1){
+            //单据查看的json模板
+            String getKDForNumbers = getGetKDForNumbers(KingDeeBillId.BD_MATERIAL.getID(), f.getFMaterialId());
+            ResultBean<String> kingDataInfoByNumber = accessKingDeeInterface(KingDeeBillId.BD_MATERIAL.getID(), getKDForNumbers,
+                    KingDeeBillUrl.VIEW_URL.getURL());
+            log.info("kingDataInfoByNumber:{}",kingDataInfoByNumber.getData());
+            JSONObject jsonObject = JSONObject.parseObject(kingDataInfoByNumber.getData().toString());
+            JSONObject result = (JSONObject)jsonObject.get("Result");
+            JSONObject responseStatus = (JSONObject)result.get("ResponseStatus");
+            log.info("kingDataInfoByNumber:{}",kingDataInfoByNumber.getData());
+            if(responseStatus!=null){//不存在该物料
+                //新增物料
+                bdMaterial(stkInStock, f);
+            }else{ //存在该物料
+                //单据查询
+                //分配物料
+                JSONObject result2 = (JSONObject)result.get("Result");
+                Integer Id = (Integer)result2.get("Id");
+                log.info("Id:{}",Id);
+                allocate(f,stkInStock,Id);
+            }
+        }
+*/
         try {
             //业务表的主表数据集合
             Map<String,String> map_fEntityModel_= object2Map(salOutStock);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json

@@ -12,7 +12,7 @@
   "FIsFree": false,
   "FOwnerTypeID": "BD_OwnerOrg",
   "Flot": {
-    "FNumber": "@KD_Flot"
+    "FNumber": "@KD_FMaterialID"
   },
   "FOwnerID": {
     "FNumber": "@KD_FSaleOrgId"