kangwei：赋能中心-药剂统购分销

@@ -87,7 +87,7 @@ public class DistributContractController {
 		queryWrapper.le("start_time", DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"));
 		queryWrapper.le("start_time", DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"));
 
 
 		//启用状态：=0
 		//启用状态：=0
-		if(StringUtils.isEmpty(distributContract.getUseFlag())){
+		if(StringUtils.isNotEmpty(distributContract.getUseFlag())){
 			use_flag = distributContract.getUseFlag();
 			use_flag = distributContract.getUseFlag();
 		}
 		}
 		queryWrapper.eq("use_flag",use_flag);
 		queryWrapper.eq("use_flag",use_flag);

@@ -3,7 +3,6 @@ package com.skua.modules.erp.mapper;
 import java.util.List;
 import java.util.List;
 
 
 import com.skua.modules.erp.entity.ErpSettlementItem;
 import com.skua.modules.erp.entity.ErpSettlementItem;
-import com.skua.modules.erp.vo.ErpSettlementFormVO;
 import com.skua.modules.erp.vo.ErpSettlementItemVO;
 import com.skua.modules.erp.vo.ErpSettlementItemVO;
 import com.skua.modules.erp.vo.ErpSettlementVO;
 import com.skua.modules.erp.vo.ErpSettlementVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
@@ -24,10 +23,8 @@ public interface ErpSettlementMapper extends BaseMapper<ErpSettlement> {
 
 
     // 根据入库单ids，获取【水厂】结算单详情
     // 根据入库单ids，获取【水厂】结算单详情
     List<ErpSettlementItem> queryWaterDepartSettlementByMaterialIds(@Param("ids") String materialIds);
     List<ErpSettlementItem> queryWaterDepartSettlementByMaterialIds(@Param("ids") String materialIds);
-    //送货单以及物资验收单
-    List<ErpSettlementItemVO> querySettlementFormById(@Param("id")String id);
     //（供应商）送货单以及物资验收单
     //（供应商）送货单以及物资验收单
     List<ErpSettlementItemVO> querySupplierSettlementFormById(@Param("id")String id);
     List<ErpSettlementItemVO> querySupplierSettlementFormById(@Param("id")String id);
     //（水厂） 送货单以及物资验收单
     //（水厂） 送货单以及物资验收单
-    List<ErpSettlementItemVO> queryWaterDepartSettlementFormById((@Param("id")String id);
+    List<ErpSettlementItemVO> queryWaterDepartSettlementFormById(@Param("id")String id);
 }
 }

@@ -49,7 +49,7 @@
         order by mi.arrive_time asc
         order by mi.arrive_time asc
     </select>
     </select>
 
 
-    <select id="querySupplierSettlementFormById" resultType="com.skua.modules.erp.voErpSettlementItemVO">
+    <select id="querySupplierSettlementFormById" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
         select d.depart_name,pc.project_name ,pc.contract_code,sm.supp_name as supplier_name,mi.arrive_time,  maf.appearance_info ,maf.matched_info ,maf.handle_msg ,maf.sender_sign ,maf.receiver_sign ,aaa.*
         select d.depart_name,pc.project_name ,pc.contract_code,sm.supp_name as supplier_name,mi.arrive_time,  maf.appearance_info ,maf.matched_info ,maf.handle_msg ,maf.sender_sign ,maf.receiver_sign ,aaa.*
          from (
          from (
          select si.sparepart_name,si.material_num,si.specification,si.measuring_unit,s.purchase_contract_id,s.supplier_id,si.material_in_id
          select si.sparepart_name,si.material_num,si.specification,si.measuring_unit,s.purchase_contract_id,s.supplier_id,si.material_in_id
@@ -62,7 +62,7 @@
         left join sys_depart d on d.id = mi.depart_id
         left join sys_depart d on d.id = mi.depart_id
     </select>
     </select>
 
 
-    <select id="queryWaterDepartSettlementFormById" resultType="com.skua.modules.erp.voErpSettlementItemVO">
+    <select id="queryWaterDepartSettlementFormById" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
         select d.depart_name,dc.contract_code,dc.contract_name as project_name ,mi.arrive_time,  maf.appearance_info ,maf.matched_info ,maf.handle_msg ,maf.sender_sign ,maf.receiver_sign ,aaa.*
         select d.depart_name,dc.contract_code,dc.contract_name as project_name ,mi.arrive_time,  maf.appearance_info ,maf.matched_info ,maf.handle_msg ,maf.sender_sign ,maf.receiver_sign ,aaa.*
          from (
          from (
          select si.sparepart_name,si.material_num,si.specification,si.measuring_unit,
          select si.sparepart_name,si.material_num,si.specification,si.measuring_unit,

@@ -12,10 +12,6 @@ import lombok.Data;
 public class ErpSettlementItemVO extends ErpSettlementItem {
 public class ErpSettlementItemVO extends ErpSettlementItem {
 	@ApiModelProperty(value = "合同编号")
 	@ApiModelProperty(value = "合同编号")
 	private String contractCode;
 	private String contractCode;
-	@ApiModelProperty(value = "物料名称")
-	private String sparepartName;
-	@ApiModelProperty(value = "规格型号")
-	private String specification;
 	@ApiModelProperty(value = "项目名称")
 	@ApiModelProperty(value = "项目名称")
 	private String projectName;
 	private String projectName;
 
 

 package com.skua.modules.report.vo.largeScreen;
 package com.skua.modules.report.vo.largeScreen;
 
 
+import com.skua.core.util.ConvertUtils;
 import com.skua.tool.util.DigitalUtils;
 import com.skua.tool.util.DigitalUtils;
 import com.skua.tool.util.JSUtils;
 import com.skua.tool.util.JSUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
@@ -102,8 +103,8 @@ public class ResultNumberVO {
     public ResultNumberVO(String name, String unit, String value, String valueTb, String valueHb) {
     public ResultNumberVO(String name, String unit, String value, String valueTb, String valueHb) {
         this.name = name;
         this.name = name;
         this.unit = unit;
         this.unit = unit;
-        this.value = value;
-        this.valueTb = valueTb;
-        this.valueHb = valueHb;
+        this.value = ConvertUtils.getString(value,"0") ;
+        this.valueTb = ConvertUtils.getString(valueTb,"0");
+        this.valueHb = ConvertUtils.getString(valueHb,"0");
     }
     }
 }
 }