diff --git a/sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialINServiceImpl.java b/sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialINServiceImpl.java index a700cc7..773c6f5 100644 --- a/sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialINServiceImpl.java +++ b/sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialINServiceImpl.java @@ -166,14 +166,14 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia */ @Transactional public String auditMaterialINVO(MaterialINVO materialINVO)throws Exception { - String errMsg = auditMaterialIn(materialINVO.getId(),materialINVO.getApproveState(),materialINVO.getApproveMessage()); + String errMsg = auditMaterialIn(materialINVO.getMaterialInId(),materialINVO.getApproveState(),materialINVO.getApproveMessage()); return errMsg; } @Transactional public String auditMaterialIn(String id , String approveState,String approveMessage) throws Exception{ String errMsg = null; - boolean inAndOutStock = false; + boolean inAndOutStock = false; //保存 MaterialIN materialINTemp = this.baseMapper.queryById(id); if(!"3".equals(materialINTemp.getAuditStatus())){ diff --git a/sk-module-biz/src/main/java/com/skua/modules/erp/vo/MaterialINVO.java b/sk-module-biz/src/main/java/com/skua/modules/erp/vo/MaterialINVO.java index 79b8270..41bc23d 100644 --- a/sk-module-biz/src/main/java/com/skua/modules/erp/vo/MaterialINVO.java +++ b/sk-module-biz/src/main/java/com/skua/modules/erp/vo/MaterialINVO.java @@ -26,6 +26,9 @@ public class MaterialINVO extends MaterialIN { @ApiModelProperty(value = "权限厂站编号集合") private String departIds; + @ApiModelProperty(value = "药剂入库编号") + private String materialInId; + @ApiModelProperty(value = "物料编码") private String sparepartCode; diff --git a/sk-module-biz/src/main/java/com/skua/modules/statistics/vo/ReportTargetStatisticsVO.java b/sk-module-biz/src/main/java/com/skua/modules/statistics/vo/ReportTargetStatisticsVO.java index ca45135..3b4653d 100644 --- a/sk-module-biz/src/main/java/com/skua/modules/statistics/vo/ReportTargetStatisticsVO.java +++ b/sk-module-biz/src/main/java/com/skua/modules/statistics/vo/ReportTargetStatisticsVO.java @@ -4,6 +4,7 @@ import com.skua.core.aspect.annotation.Dict; import com.skua.tool.util.JSUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import liquibase.util.StringUtils; import lombok.Data; import java.util.List; @@ -59,4 +60,20 @@ public class ReportTargetStatisticsVO { expression = "100 * ( "+monthValue+"/"+monthTarget+" )"; this.monthWcBL = JSUtils.executeExpression(expression,"0.00"); } + + public String getYearWcBL() { + if(StringUtils.isEmpty(this.yearWcBL) && StringUtils.isNotEmpty(this.yearTarget) && StringUtils.isNotEmpty(this.yearValue)){ + String expression = "100 * ( "+this.yearValue+"/"+this.yearTarget+" )"; + this.yearWcBL = JSUtils.executeExpression(expression,"0.00"); + } + return yearWcBL; + } + + public String getMonthWcBL() { + if(StringUtils.isEmpty(this.monthWcBL) && StringUtils.isNotEmpty(this.monthTarget) && StringUtils.isNotEmpty(this.monthValue)){ + String expression = "100 * ( "+this.monthValue+"/"+this.monthTarget+" )"; + this.monthWcBL = JSUtils.executeExpression(expression,"0.00"); + } + return monthWcBL; + } }