diff --git a/lc123/cloud/app/api/controller/WMSAdjustBillController.java b/lc123/cloud/app/api/controller/WMSAdjustBillController.java index 757178a..f18de5b 100644 --- a/lc123/cloud/app/api/controller/WMSAdjustBillController.java +++ b/lc123/cloud/app/api/controller/WMSAdjustBillController.java @@ -428,7 +428,7 @@ public class WMSAdjustBillController { } String itemId = ckObj.getString("itemId");//仓储系统商品ID-条件必填 String inventoryType = ckObj.getString("inventoryType");//库存类型-ZP=正品, CC=残次,JS=机损, XS= 箱损, ZT=在途库存,DJ=冻结 - String quantity = ckObj.getString("quantity");//异动数量-必填,有正负 + int quantity = ckObj.getIntValue("quantity");//异动数量-必填,有正负 if (ApiResultExt.validateRequired(quantity, "int")) { errormsg = errormsg.append(";").append("传入参数 quantity 为空"); } @@ -470,7 +470,7 @@ public class WMSAdjustBillController { Date expireDate_e = rkObj.getDate("expireDate"); //调整后商品 DynamicObject iGoods = null; - DynamicObject[] iGoodsArr = BaseDataMatchUtils.materialMatchGoods(itemCode, batchCode_e, productDate, expireDate, true); + DynamicObject[] iGoodsArr = BaseDataMatchUtils.materialMatchGoods(itemCode, batchCode_e, productDate_e, expireDate_e, true); if(iGoodsArr != null && iGoodsArr.length > 0){ iGoods = iGoodsArr[0]; }else{ diff --git a/lc123/cloud/app/api/utils/ApiResultExt.java b/lc123/cloud/app/api/utils/ApiResultExt.java index 40f01f1..a26daa1 100644 --- a/lc123/cloud/app/api/utils/ApiResultExt.java +++ b/lc123/cloud/app/api/utils/ApiResultExt.java @@ -252,6 +252,10 @@ public class ApiResultExt implements Serializable { } catch (NumberFormatException e) { return true; // 无法转为BigDecimal返回 true } + case "int": + case "Date": + return false; + default: return true; // 如果没有匹配的类型,返回 true }