kangwei：修改bug，优化代码

@@ -166,14 +166,14 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
      */
      */
     @Transactional
     @Transactional
     public String auditMaterialINVO(MaterialINVO materialINVO)throws  Exception {
     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;
         return errMsg;
     }
     }
 
 
     @Transactional
     @Transactional
     public String  auditMaterialIn(String id , String approveState,String approveMessage) throws Exception{
     public String  auditMaterialIn(String id , String approveState,String approveMessage) throws Exception{
         String errMsg = null;
         String errMsg = null;
-        boolean inAndOutStock = false;
+         boolean inAndOutStock = false;
         //保存
         //保存
         MaterialIN materialINTemp = this.baseMapper.queryById(id);
         MaterialIN materialINTemp = this.baseMapper.queryById(id);
         if(!"3".equals(materialINTemp.getAuditStatus())){
         if(!"3".equals(materialINTemp.getAuditStatus())){

@@ -26,6 +26,9 @@ public class MaterialINVO   extends MaterialIN {
     @ApiModelProperty(value = "权限厂站编号集合")
     @ApiModelProperty(value = "权限厂站编号集合")
     private String departIds;
     private String departIds;
 
 
+    @ApiModelProperty(value = "药剂入库编号")
+    private String materialInId;
+
 
 
     @ApiModelProperty(value = "物料编码")
     @ApiModelProperty(value = "物料编码")
     private String sparepartCode;
     private String sparepartCode;

@@ -4,6 +4,7 @@ import com.skua.core.aspect.annotation.Dict;
 import com.skua.tool.util.JSUtils;
 import com.skua.tool.util.JSUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
+import liquibase.util.StringUtils;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.util.List;
 import java.util.List;
@@ -59,4 +60,20 @@ public class ReportTargetStatisticsVO {
         expression = "100 * ( "+monthValue+"/"+monthTarget+" )";
         expression = "100 * ( "+monthValue+"/"+monthTarget+" )";
         this.monthWcBL = JSUtils.executeExpression(expression,"0.00");
         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;
+    }
 }
 }