药剂入库id 修改

@@ -166,7 +166,7 @@ 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;
     }
     }
 
 

@@ -23,6 +23,10 @@ public class MaterialINVO   extends MaterialIN {
     @ApiModelProperty(value = "税额")
     @ApiModelProperty(value = "税额")
     private String taxAmount;
     private String taxAmount;
 
 
+
+    @ApiModelProperty(value = "药剂入口编号")
+    private String materialInId;
+
     @ApiModelProperty(value = "权限厂站编号集合")
     @ApiModelProperty(value = "权限厂站编号集合")
     private String departIds;
     private String departIds;