kangwei: 修改药剂结算，税率不显示问题，

          修改药剂审核导出，药剂入库导出问题

@@ -64,6 +64,9 @@ public class ErpSettlementController {
 		if(StringUtils.isNotEmpty(erpSettlementSearchVO.getSupplierId())){
 			queryWrapper.eq("supplier_id" ,erpSettlementSearchVO.getSupplierId()) ;
 		}
+		//结算类型
+		queryWrapper.eq("settlement_type" ,erpSettlementSearchVO.getSettlementType()) ;
+
 		String startDate = req.getParameter("startDate");
 		if(StringUtils.isNotEmpty(startDate)){
 			startDate = startDate+" 00:00:00";
@@ -115,6 +118,8 @@ public class ErpSettlementController {
 			if(erpSettlementItemList != null && !erpSettlementItemList.isEmpty()){
 				erpSettlementVO.setItemList( erpSettlementItemList );
 				erpSettlementVO.setSparepartSettlementList( converErpSettlementItemList(erpSettlementItemList)  );
+				// 计算总价、总数、价税合计
+				erpSettlementVO.calculatePrice();
 				result.setResult(erpSettlementVO);
 				result.setSuccess(true);
 			}else{
@@ -162,6 +167,9 @@ public class ErpSettlementController {
 				erpSettlementVO.setItemList(settlementItemList );
 				//送货单以及物资验收单
 				erpSettlementVO.setSparepartSettlementList( converErpSettlementItemList(settlementItemList)  );
+
+				// 计算总价、总数、价税合计
+				erpSettlementVO.calculatePrice();
 				result.setResult(erpSettlementVO);
 				result.setSuccess(true);
 			}else{
@@ -369,19 +377,10 @@ public class ErpSettlementController {
 	}*/
 
   @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+  public ModelAndView exportXls(ErpSettlement erpSettlement,HttpServletRequest request, HttpServletResponse response) {
       // Step.1 组装查询条件
       QueryWrapper<ErpSettlement> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (ConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              ErpSettlement erpSettlement = JSON.parseObject(deString, ErpSettlement.class);
 	  queryWrapper = QueryGenerator.initQueryWrapper(erpSettlement, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
 
       //Step.2 AutoPoi 导出Excel
       ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());

@@ -358,22 +358,10 @@ public class MaterialINController {
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 */
 	@RequestMapping(value = "/exportXls")
-	public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+	public ModelAndView exportXls(MaterialIN materialIN,HttpServletRequest request, HttpServletResponse response) {
 		// Step.1 组装查询条件
 		QueryWrapper<MaterialIN> queryWrapper = null;
-		try {
-			String paramsStr = request.getParameter("paramsStr");
-			if (ConvertUtils.isNotEmpty(paramsStr)) {
-				String deString = URLDecoder.decode(paramsStr, "UTF-8");
-				MaterialIN materialIN = JSON.parseObject(deString, MaterialIN.class);
 		queryWrapper = QueryGenerator.initQueryWrapper(materialIN, request.getParameterMap());
-			}
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-		}
-		if(queryWrapper == null ){
-			queryWrapper =  new QueryWrapper();
-		}
 		//到货时间排序
 		queryWrapper.orderByDesc("arrive_time");
 		//Step.2 AutoPoi 导出Excel
@@ -388,25 +376,12 @@ public class MaterialINController {
 	}
     //导出到货记录
     @RequestMapping(value = "/exportArrivalRecord")
-    public ModelAndView exportArrivalRecord(HttpServletRequest request, HttpServletResponse response) {
+    public ModelAndView exportArrivalRecord(MaterialIN materialIN,HttpServletRequest request, HttpServletResponse response) {
         // Step.1 组装查询条件
         QueryWrapper<MaterialIN> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (ConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                MaterialIN materialIN = JSON.parseObject(deString, MaterialIN.class);
 		queryWrapper = QueryGenerator.initQueryWrapper(materialIN, request.getParameterMap());
-
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-		if(queryWrapper == null ){
-			queryWrapper =  new QueryWrapper();
-		}
 		//全部确认的数据
-		queryWrapper.eq("confirm_status","9");
+		//queryWrapper.eq("confirm_status","9");
 		queryWrapper.eq("audit_status","3");
 		queryWrapper.orderByDesc("arrive_time");
 
@@ -419,10 +394,10 @@ public class MaterialINController {
 
         int index = 1;
         if(materialINList != null && !materialINList.isEmpty()){
-            for(MaterialIN  materialIN  : materialINList){
+            for(MaterialIN  materialINTemp  : materialINList){
                 arrivalRecordVO = new MaterialINArrivalRecordVO();
                 //BeanUtils.copyProperties(有值的对象, 要被赋值的对象);
-                BeanUtils.copyProperties(materialIN, arrivalRecordVO);
+                BeanUtils.copyProperties(materialINTemp, arrivalRecordVO);
                 arrivalRecordVO.setIndex( index++);
                 dataList.add( arrivalRecordVO ) ;
             }

@@ -42,12 +42,6 @@ public class ErpSettlement {
     @ApiModelProperty(value = "水厂编号")
 	@Dict(dictTable="sys_depart",dicCode = "id",dicText = "depart_name")
 	private String departId;
-	/**采购合同*/
-	@ApiModelProperty(value = "采购合同")
-	private String purchaseContractId;
-	/**分销合同*/
-	@ApiModelProperty(value = "分销合同")
-	private String distributContractId;
 
 	/**合同编号*/
 	@ApiModelProperty(value = "合同编号")
@@ -61,10 +55,7 @@ public class ErpSettlement {
 	@Excel(name = "结算金额", width = 15)
     @ApiModelProperty(value = "结算金额")
 	private String totalPrice;
-	/**税额*/
-	@Excel(name = "税额", width = 15)
-    @ApiModelProperty(value = "税额")
-	private String taxAmount;
+
 	/**价税合计*/
 	@Excel(name = "总价不含税", width = 15)
     @ApiModelProperty(value = "总价不含税")

 package com.skua.modules.erp.entity;
 
-import java.io.Serializable;
-import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.skua.core.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 /**

@@ -180,12 +180,12 @@ public class MaterialIN {
 	@ApiModelProperty(value = "出库编号")
 	private String equipmentOutId;
 
-    @Excel(name = "供应商结算", width = 15)
+    @Excel(name = "供应商结算", width = 15,dicCode="settlement_status")
 	@ApiModelProperty(value = "供应商结算，0:申请,1::已申请，2：已结算")
     @Dict( dicCode="settlement_status")
 	private Integer supplierSettlementFlag;
 
-    @Excel(name = "水厂结算", width = 15)
+    @Excel(name = "水厂结算", width = 15,dicCode="settlement_status")
 	@ApiModelProperty(value = "水厂结算，0:未申请,1:已申请，2：已结算")
     @Dict( dicCode="settlement_status")
 	private Integer waterDepartSettlementFlag;

@@ -43,7 +43,7 @@
     <!--  根据入库单ids，获取水厂结算单详情-->
     <select id="queryWaterDepartSettlementByMaterialIds" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
          select d.depart_name, dc.contract_name ,dc.project_name, dc.contract_code, dm.distribut_price 'unit_price'  , pm.good_brand , pm.good_origin, mf.jishu_file_path,  mf.appearance_info,  mf.matched_info ,mf.handle_msg,mf.sender_sign,mf.receiver_sign,  dm.tax_amount ,
-         round(dm.distribut_price * mi.material_num,2)  total_price, round(pm.unit_price * mi.material_num *100 /(100+ ifnull(dm.tax_amount,0)) ,2)  total_price_tax,
+         round(dm.distribut_price * mi.material_num,2)  total_price, round(dm.distribut_price * mi.material_num *100 /(100+ ifnull(dm.tax_amount,0)) ,2)  total_price_tax,
              mi.depart_id , mi.distribut_contract_id ,mi.purchase_contract_id, mi.material_num,
              mi.arrive_time ,mi.remark,mi.sparepart_type,mi.sparepart_id,mi.sparepart_name,mi.sparepart_code,mi.specification,  mi.measuring_unit,mi.good_code,mi.id 'material_in_id'
         from erp_material_in mi

 package com.skua.modules.erp.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.skua.modules.erp.entity.ErpSettlementItem;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

@@ -21,4 +21,7 @@ public class ErpSettlementSearchVO {
 
     @ApiModelProperty(value = "结束时间")
     private String endDate;
+
+    @ApiModelProperty(value = "结算类型")
+    private String settlementType;
 }

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.skua.modules.erp.entity.ErpSettlement;
 import com.skua.modules.erp.entity.ErpSettlementItem;
+import com.skua.tool.util.JSUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -34,12 +35,39 @@ public class ErpSettlementVO  extends ErpSettlement {
 	@ApiModelProperty(value = "部门名称")
 	private String departName;
 
+	/*@ApiModelProperty(value = "数量")
+	private String materialNum;
+
+	@ApiModelProperty(value = "结算金额")
+	private String totalPrice;
+
+	@ApiModelProperty(value = "结算金额-不含税")
+	private String totalPriceTax;*/
+
 	@ApiModelProperty(value = "结算清单")
 	private List<ErpSettlementItemVO> itemList ;
 
-
 	@ApiModelProperty(value = "物料结算记录")
 	private List<SparepartSettlementVO> sparepartSettlementList ;
 
-
+	/***
+	 * 计算总数、总价、价税合计
+	 */
+	public void calculatePrice(){
+		String materialNumExpression = "0";
+		String totalPriceExpression = "0";
+		String totalPriceTaxExpression ="0";
+		if(itemList != null && !itemList.isEmpty()){
+			for(ErpSettlementItemVO settlementItemVO : itemList){
+				materialNumExpression = materialNumExpression + "+" +settlementItemVO.getMaterialNum();
+				totalPriceExpression = totalPriceExpression + "+" +settlementItemVO.getTotalPrice();
+				totalPriceTaxExpression = totalPriceTaxExpression + "+" +settlementItemVO.getTotalPriceTax();
+				//totalPriceExpression = totalPriceExpression + "+ (" +settlementItemVO.getUnitPrice() +" * "+settlementItemVO.getMaterialNum()+")";
+				//totalPriceTaxExpression = totalPriceTaxExpression + "+ (" +settlementItemVO.getUnitPrice() +" * "+settlementItemVO.getMaterialNum()+" / (1+ "+settlementItemVO.getTaxAmount()+" * 0.01))";
+			}
+			this.setMaterialNum( JSUtils.executeExpression(materialNumExpression,"0.00"));
+			this.setTotalPrice( JSUtils.executeExpression(totalPriceExpression,"0.00"));
+			this.setTotalPriceTax( JSUtils.executeExpression(totalPriceTaxExpression,"0.00"));
+		}
+	}
 }