diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkInstockNumber/FinStkInstockNumberService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkInstockNumber/FinStkInstockNumberService.java index 5314670551..ea6b5135c5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkInstockNumber/FinStkInstockNumberService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkInstockNumber/FinStkInstockNumberService.java @@ -72,7 +72,8 @@ public class FinStkInstockNumberService extends MybatisBaseService datasByFMaterialId = getDatasByFMaterialId(finStkInstockNumber); if(datasByFMaterialId==null||datasByFMaterialId.size()==0){ - return rb.setMsg("没有对应的入库单!"); + //return rb.setMsg("没有对应的入库单!"); + return rb.success().setData(null); } FinStkInstockNumber finStkInstockNumber1 = datasByFMaterialId.get(0); String stkInstockId = finStkInstockNumber1.getStkInstockId(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java index 5c2afd3300..a680df5917 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java @@ -178,9 +178,12 @@ public class STKInStockService extends FinKingDeeService { public ResultBean getStinstockState(String fMaterialId){ ResultBean rb=ResultBean.fireFail(); ResultBean stinstockByFMaterialId = finStkInstockNumberService.getStinstockByFMaterialId(fMaterialId); - if(!stinstockByFMaterialId.getSuccess()||stinstockByFMaterialId.getData()==null){ + if(!stinstockByFMaterialId.getSuccess()){ return rb.setData(false); } + if(stinstockByFMaterialId.getSuccess()&&stinstockByFMaterialId.getData()==null){//手动补充的入库单 默认是审核通过的 + return rb.success().setData(true); + } String data = stinstockByFMaterialId.getData(); log.info("getStinstockState:{}",data); JSONObject jsonObject = JSONObject.parseObject(data);