diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java index 32badc7346..04ce3ce2c0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java @@ -131,9 +131,22 @@ public class StkInStock { /** * // 批号:FLot - */@JsonProperty("FLot") + */ + @JsonProperty("FLot") @NotBlank(message = "FLot不能为空") public String FLot; + /** + * 存货类别:FCategoryIDType + */ + @JsonProperty("FCategoryIDType") + @NotBlank(message = "FCategoryIDType不能为空") + public String FCategoryIDType; + /** + * 存货类别:FCategoryIDKey + */ + @JsonProperty("FCategoryIDKey") + @NotBlank(message = "FCategoryIDKey不能为空") + public String FCategoryIDKey; /** * // 仓库:FStockId diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java index 172ef70e0c..13fcb93656 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java @@ -17,10 +17,6 @@ import java.util.List; public class StkTransferDirect { @Data public static class FBillEntry{ - /* 调入库存状态:FDestStockStatusId (必填项)*/ - /*@JsonProperty("FDestStockStatusId") - @NotBlank - public String FDestStockStatusId;*/ /* 调入仓库 (必填项)*/ @JsonProperty("FDestStockId") @NotBlank(message = "FDestStockId不能为空") @@ -33,6 +29,16 @@ public class StkTransferDirect { @JsonProperty("FSrcStockId") @NotBlank(message = "FSrcStockId不能为空") public String FSrcStockId; + /*调出批号:FLot*/ + @JsonProperty("FLot") + public String FLot; + /*调入批号:FDestLot*/ + @JsonProperty("FDestLot") + public String FDestLot; + /* 调入库存状态:FDestStockStatusId (必填项)*/ + /*@JsonProperty("FDestStockStatusId") + @NotBlank + public String FDestStockStatusId;*/ /*调出库存状态:FSrcStockStatusId (必填项)*/ /* @JsonProperty("FSrcStockStatusId") @NotBlank @@ -53,9 +59,6 @@ public class StkTransferDirect { /* @JsonProperty("FOwnerOutId") @NotBlank public String FOwnerOutId;*/ - /*调出批号:FLot*/ - @JsonProperty("FLot") - public String FLot; /* 调出货主类型:FOwnerTypeOutId (必填项)*/ /*@JsonProperty("FOwnerTypeOutId") @NotBlank @@ -64,9 +67,6 @@ public class StkTransferDirect { /* @JsonProperty("FOwnerTypeOutId") @NotBlank public String FBusinessDate;*/ - /*调入批号:FDestLot*/ - @JsonProperty("FDestLot") - public String FDestLot; /* 调入货主:FOwnerId (必填项)*/ /* @JsonProperty("FOwnerId") @NotBlank @@ -88,15 +88,6 @@ public class StkTransferDirect { // @NotBlank //public String FUnitID; } - /* 调入货主:FOwnerIdHead (必填项)*/ - /* @JsonProperty("FOwnerIdHead") - @NotBlank(message = "FOwnerIdHead不能为空") - public String FOwnerIdHead;*/ - /* 调出库存组织:FStockOutOrgId (必填项)*/ - /* @JsonProperty("FStockOutOrgId") - @NotBlank(message = "FStockOutOrgId不能为空") - public String FStockOutOrgId;*/ - /* 调入库存组织:FStockOrgId (必填项)*/ @JsonProperty("FStockOrgId") @NotBlank(message = "FStockOrgId不能为空") public String FStockOrgId; @@ -109,6 +100,15 @@ public class StkTransferDirect { */ @JsonProperty("FNote") public String FNote=""; + /* 调入货主:FOwnerIdHead (必填项)*/ + /* @JsonProperty("FOwnerIdHead") + @NotBlank(message = "FOwnerIdHead不能为空") + public String FOwnerIdHead;*/ + /* 调出库存组织:FStockOutOrgId (必填项)*/ + /* @JsonProperty("FStockOutOrgId") + @NotBlank(message = "FStockOutOrgId不能为空") + public String FStockOutOrgId;*/ + /* 调入库存组织:FStockOrgId (必填项)*/ /* 调拨类型:FTransferBizType (必填项)*/ /*@JsonProperty("FTransferBizType") @NotBlank diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java index 88c1f72094..6543aa74d7 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java @@ -77,7 +77,7 @@ public class BdMaterialService extends FinKingDeeService { private List getKeyItems() { List params=new ArrayList<>(); - /* params.add(new KeyItem("FCategoryID","存货类别") );*/ + params.add(new KeyItem("FCategoryID","存货类别") ); /* params.add(new KeyItem("FMaterialGroup","物料分组") );*/ params.add(new KeyItem("F_PAEZ_Base","车辆类型") ); /* params.add(new KeyItem("F_PAEZ_Base2","车辆系别") ); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json index be2cf6bca7..eb1db37e07 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json @@ -19,10 +19,10 @@ "FNumber": "@KD_FDestStockId" }, "FSrcStockStatusId": { - "FNumber": "KCZT01_SYS" + "FNumber": "KCZT02_SYS" }, "FDestStockStatusId": { - "FNumber": "KCZT01_SYS" + "FNumber": "KCZT02_SYS" }, "FBusinessDate": "@KD_FDate", "FOwnerTypeOutId": "BD_OwnerOrg",