微调

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/controller/WebApi.java

@@ -149,7 +149,7 @@ public class WebApi {
     @AutoLog(value = "IMS通用接口")
     @ApiOperation(value = "IMS通用接口", notes = "IMS通用接口")
     @PostMapping(value = "/GetData")
-    public Result<?> GetData(@RequestBody ImsRequest request) throws ParseException {
+    public Result<?> GetData(@RequestBody ImsRequest request) {
         if (CollectionUtils.isEmpty(request.getData())) {
             return Result.fail("操作失败", "查询参数不能全为空", request.getDocType());
         }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/kingdeeapi/PurchaseReturnKingdeeApi.java

@@ -52,6 +52,8 @@ public class PurchaseReturnKingdeeApi {
         key.put("FSettleCurrId.Fname", "FSettleCurrId.Fname");
         /* 结算方式 */
         key.put("FSettleTypeId.Fname", "FSettleTypeId.Fname");
+        /* 采购员 */
+        key.put("FPurchaserId.Fname", "FPurchaserId.Fname");
         /* 物料编码 */
         key.put("FMaterialId.Fnumber", "FMaterialId.Fnumber");
         /* 实退数量 */
@@ -60,8 +62,14 @@ public class PurchaseReturnKingdeeApi {
         key.put("FPrice", "FPrice");
         /* 含税单价 */
         key.put("FTaxPrice", "FTaxPrice");
-        /* 库存单位 */
-        key.put("FUnitID.Fname", "FUnitID.Fname");
+        /* 计价单位 */
+        key.put("FPriceUnitID.Fname", "FPriceUnitID.Fname");
+        /* 税率 */
+        key.put("FEntryTaxRate", "FEntryTaxRate");
+        /* 折扣额 */
+        key.put("FDiscount", "FDiscount");
+        /* 金额 */
+        key.put("FAmount", "FAmount");
         /* 采购订单分录内码 */
         key.put("FPOORDERENTRYID", "FPOORDERENTRYID");
     }
@@ -114,15 +122,19 @@ public class PurchaseReturnKingdeeApi {
                         map.put("PAYMENT_TERMS", String.valueOf(objectList.get(11)));
                         map.put("CURRENCY", String.valueOf(objectList.get(12)));
                         map.put("SETTLEMENT_METHOD", String.valueOf(objectList.get(13)));
+                        map.put("BUYER", String.valueOf(objectList.get(14)));
 
                         Map<String, Object> detailedMap = new HashMap<>(7);
                         detailedMap.put("RETURN_MATERIAL_NO", objectList.get(1) + "_" + objectList.get(3));
-                        detailedMap.put("MATERIAL_CODE", String.valueOf(objectList.get(14)));
-                        detailedMap.put("ACTUAL_RETURNED_QTY", String.valueOf(objectList.get(15)));
-                        detailedMap.put("PRICE", String.valueOf(objectList.get(16)));
-                        detailedMap.put("TAX_PRICE", String.valueOf(objectList.get(17)));
-                        detailedMap.put("UNIT", String.valueOf(objectList.get(18)));
-                        List<List<Object>> tempList = getPurchaseOrder(String.valueOf(objectList.get(19)));
+                        detailedMap.put("MATERIAL_CODE", String.valueOf(objectList.get(15)));
+                        detailedMap.put("ACTUAL_RETURNED_QTY", String.valueOf(objectList.get(16)));
+                        detailedMap.put("PRICE", String.valueOf(objectList.get(17)));
+                        detailedMap.put("TAX_PRICE", String.valueOf(objectList.get(18)));
+                        detailedMap.put("UNIT", String.valueOf(objectList.get(19)));
+                        detailedMap.put("TAX_RATE", String.valueOf(objectList.get(20)));
+                        detailedMap.put("DISCOUNT_AMOUNT", String.valueOf(objectList.get(21)));
+                        detailedMap.put("AMOUNT", String.valueOf(objectList.get(22)));
+                        List<List<Object>> tempList = getPurchaseOrder(String.valueOf(objectList.get(23)));
                         if (!CollectionUtils.isEmpty(tempList)) {
                             String purchaseBatchNumber = tempList.get(0).get(0).toString() + "_" + tempList.get(0).get(1).toString();
                             detailedMap.put("PURCHASE_BATCH_NUMBER", purchaseBatchNumber);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/kingdeeapi/PurchaseWarehousingKingdeeApi.java

@@ -52,6 +52,8 @@ public class PurchaseWarehousingKingdeeApi {
         key.put("FSettleCurrId.Fname", "FSettleCurrId.Fname");
         /* 结算方式 */
         key.put("FSettleTypeId.Fname", "FSettleTypeId.Fname");
+        /* 采购员 */
+        key.put("FPurchaserId.Fname", "FPurchaserId.Fname");
         /* 物料编码 */
         key.put("FMaterialId.Fnumber", "FMaterialId.Fnumber");
         /* 实收数量 */
@@ -60,8 +62,14 @@ public class PurchaseWarehousingKingdeeApi {
         key.put("FPrice", "FPrice");
         /* 含税单价 */
         key.put("FTaxPrice", "FTaxPrice");
-        /* 库存单位 */
-        key.put("FUnitID.Fname", "FUnitID.Fname");
+        /* 计价单位 */
+        key.put("FPriceUnitID.Fname", "FPriceUnitID.Fname");
+        /* 税率 */
+        key.put("FEntryTaxRate", "FEntryTaxRate");
+        /* 折扣额 */
+        key.put("FDiscount", "FDiscount");
+        /* 金额 */
+        key.put("FAmount", "FAmount");
         /* 采购订单分录内码 */
         key.put("FPOORDERENTRYID", "FPOORDERENTRYID");
     }
@@ -113,15 +121,19 @@ public class PurchaseWarehousingKingdeeApi {
                         map.put("PAYMENT_TERMS", String.valueOf(objectList.get(11)));
                         map.put("CURRENCY", String.valueOf(objectList.get(12)));
                         map.put("SETTLEMENT_METHOD", String.valueOf(objectList.get(13)));
+                        map.put("BUYER", String.valueOf(objectList.get(14)));
 
                         Map<String, Object> detailedMap = new HashMap<>(7);
                         detailedMap.put("WAREHOUSING_NO", objectList.get(1) + "_" + objectList.get(3));
-                        detailedMap.put("MATERIAL_CODE", String.valueOf(objectList.get(14)));
-                        detailedMap.put("RECEIVED_QTY", String.valueOf(objectList.get(15)));
-                        detailedMap.put("PRICE", String.valueOf(objectList.get(16)));
-                        detailedMap.put("TAX_PRICE", String.valueOf(objectList.get(17)));
-                        detailedMap.put("UNIT", String.valueOf(objectList.get(18)));
-                        List<List<Object>> tempList = getPurchaseOrder(String.valueOf(objectList.get(19)));
+                        detailedMap.put("MATERIAL_CODE", String.valueOf(objectList.get(15)));
+                        detailedMap.put("RECEIVED_QTY", String.valueOf(objectList.get(16)));
+                        detailedMap.put("PRICE", String.valueOf(objectList.get(17)));
+                        detailedMap.put("TAX_PRICE", String.valueOf(objectList.get(18)));
+                        detailedMap.put("UNIT", String.valueOf(objectList.get(19)));
+                        detailedMap.put("TAX_RATE", String.valueOf(objectList.get(20)));
+                        detailedMap.put("DISCOUNT_AMOUNT", String.valueOf(objectList.get(21)));
+                        detailedMap.put("AMOUNT", String.valueOf(objectList.get(22)));
+                        List<List<Object>> tempList = getPurchaseOrder(String.valueOf(objectList.get(23)));
                         if (!CollectionUtils.isEmpty(tempList)) {
                             String purchaseBatchNumber = tempList.get(0).get(0).toString() + "_" + tempList.get(0).get(1).toString();
                             detailedMap.put("PURCHASE_BATCH_NUMBER", purchaseBatchNumber);