kangwei: 1、药剂入库审核功能，搜索未审核状态查询出未审核数据，但是未审核的数据集团是不应该可以看到的，这个地方审核状态应该只有已审核、待审核。

4、水厂药剂导出有采购价格（优先处理）

@@ -419,6 +419,18 @@ public class JSUtils {
         return str;
         return str;
     }
     }
 
 
+    public static String quoteEach(List<String>  idList,String splitStr) {
+        if( idList != null && !idList.isEmpty() ){
+            String result = "";
+            for(String id : idList){
+                if(result.length()>0) result +=",";
+                result += "'"+ id +"'";
+            }
+            return result;
+        }
+        return "";
+    }
+
 
 
     /***
     /***
      * 计算时间的前几个月的月份
      * 计算时间的前几个月的月份

@@ -56,10 +56,11 @@ public class ErpSettlementController {
 		Result<IPage<ErpSettlement>> result = new Result<IPage<ErpSettlement>>();
 		Result<IPage<ErpSettlement>> result = new Result<IPage<ErpSettlement>>();
 		QueryWrapper<ErpSettlement> queryWrapper =  new QueryWrapper();// QueryGenerator.initQueryWrapper(erpSettlement, req.getParameterMap());
 		QueryWrapper<ErpSettlement> queryWrapper =  new QueryWrapper();// QueryGenerator.initQueryWrapper(erpSettlement, req.getParameterMap());
 		Page<ErpSettlement> page = new Page<ErpSettlement>(pageNo, pageSize);
 		Page<ErpSettlement> page = new Page<ErpSettlement>(pageNo, pageSize);
-
+		//水务公司
 		if(StringUtils.isNotEmpty(erpSettlementSearchVO.getDepartId())){
 		if(StringUtils.isNotEmpty(erpSettlementSearchVO.getDepartId())){
 			queryWrapper.eq("depart_id" ,erpSettlementSearchVO.getDepartId()) ;
 			queryWrapper.eq("depart_id" ,erpSettlementSearchVO.getDepartId()) ;
 		}
 		}
+		//供应商
 		if(StringUtils.isNotEmpty(erpSettlementSearchVO.getSupplierId())){
 		if(StringUtils.isNotEmpty(erpSettlementSearchVO.getSupplierId())){
 			queryWrapper.eq("supplier_id" ,erpSettlementSearchVO.getSupplierId()) ;
 			queryWrapper.eq("supplier_id" ,erpSettlementSearchVO.getSupplierId()) ;
 		}
 		}

@@ -22,6 +22,7 @@ import com.skua.modules.equipment.service.ISupplierManageService;
 import com.skua.modules.erp.entity.ERPPurchaseContract;
 import com.skua.modules.erp.entity.ERPPurchaseContract;
 import com.skua.modules.erp.entity.MaterialAcceptanceForm;
 import com.skua.modules.erp.entity.MaterialAcceptanceForm;
 import com.skua.modules.erp.entity.MaterialIN;
 import com.skua.modules.erp.entity.MaterialIN;
+import com.skua.modules.erp.service.IDistributContractService;
 import com.skua.modules.erp.service.IERPPurchaseContractService;
 import com.skua.modules.erp.service.IERPPurchaseContractService;
 import com.skua.modules.erp.service.IMaterialAcceptanceFormService;
 import com.skua.modules.erp.service.IMaterialAcceptanceFormService;
 import com.skua.modules.erp.service.IMaterialINService;
 import com.skua.modules.erp.service.IMaterialINService;
@@ -37,6 +38,7 @@ import com.skua.modules.supplies.service.IEquipmentSparepartSuppliesService;
 import com.skua.modules.supplies.service.IEquipmentSparepartTypeService;
 import com.skua.modules.supplies.service.IEquipmentSparepartTypeService;
 import com.skua.modules.system.entity.SysDepart;
 import com.skua.modules.system.entity.SysDepart;
 import com.skua.modules.system.service.ISysDepartService;
 import com.skua.modules.system.service.ISysDepartService;
+import com.skua.tool.util.JSUtils;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -84,7 +86,7 @@ public class MaterialINController {
 	@Autowired
 	@Autowired
 	private IMaterialAcceptanceFormService materialAcceptanceFormService;//验收单
 	private IMaterialAcceptanceFormService materialAcceptanceFormService;//验收单
 	@Autowired
 	@Autowired
-	private IEquipmentSparepartTypeService sparepartTypeService;
+	private IDistributContractService distributContractService;//分销合同编号
 	/**
 	/**
 	 * <pre>
 	 * <pre>
 	 * 	分页列表查询
 	 * 	分页列表查询
@@ -164,7 +166,23 @@ public class MaterialINController {
 		if(StringUtils.isNotBlank(materialIN.getEndTime())){
 		if(StringUtils.isNotBlank(materialIN.getEndTime())){
 			queryWrapper.le("arrive_time",materialIN.getEndTime());
 			queryWrapper.le("arrive_time",materialIN.getEndTime());
 		}*/
 		}*/
-
+		//全部确认的数据
+		queryWrapper.eq("confirm_status","9");
+		//检索采购合同
+		if(StringUtils.isNotEmpty(req.getParameter("purchaseContractCode"))){
+			List<String> purchaseContractIdList = purchaseContractService.selectIdsByCode(req.getParameter("purchaseContractCode"));
+			//purchaseContractIds
+			if(purchaseContractIdList != null && !purchaseContractIdList.isEmpty()){
+				queryWrapper.in("purchase_contract_id", JSUtils.quoteEach(purchaseContractIdList,","));
+			}
+		}
+		//检索分销合同
+		if(StringUtils.isNotEmpty(req.getParameter("distributContractCode"))){
+			List<String> distributContractIdList = distributContractService.selectIdsByCode(req.getParameter("distributContractCode"));
+			if(distributContractIdList != null && !distributContractIdList.isEmpty()){
+				queryWrapper.in("distribut_contract_id", JSUtils.quoteEach(distributContractIdList,","));
+			}
+		}
 		// 需要添加条件判断
 		// 需要添加条件判断
 		if(StringUtils.isEmpty(materialIN.getAuditStatus())){
 		if(StringUtils.isEmpty(materialIN.getAuditStatus())){
 			queryWrapper.gt("audit_status" , "0");// >0
 			queryWrapper.gt("audit_status" , "0");// >0
@@ -181,10 +199,12 @@ public class MaterialINController {
 	@AutoLog(value = "erp--物料(药剂)入库--药剂到货日验收记录")
 	@AutoLog(value = "erp--物料(药剂)入库--药剂到货日验收记录")
 	@ApiOperation(value="erp--物料(药剂)入库-药剂到货日验收记录", notes="erp--物料(药剂)入库-药剂到货日验收记录")
 	@ApiOperation(value="erp--物料(药剂)入库-药剂到货日验收记录", notes="erp--物料(药剂)入库-药剂到货日验收记录")
 	@GetMapping(value = "/arrivalRecordList")
 	@GetMapping(value = "/arrivalRecordList")
-	public Result<List<ArrivalRecordExcelExportVO>> arrivalRecordList(MaterialIN materialIN) {
-		Result<List<ArrivalRecordExcelExportVO>> result = new Result<List<ArrivalRecordExcelExportVO>>();
-	/*	QueryWrapper<MaterialIN> queryWrapper = new QueryWrapper();//QueryGenerator.initQueryWrapper(materialIN, req.getParameterMap());
-		if(StringUtils.isNotBlank(materialIN.getGoodCode())){
+	public Result<List<MaterialIN>> arrivalRecordList(MaterialIN materialIN,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													  HttpServletRequest req) {
+		Result<List<MaterialIN>> result = new Result<List<MaterialIN>>();
+		QueryWrapper<MaterialIN> queryWrapper = QueryGenerator.initQueryWrapper(materialIN, req.getParameterMap());
+		/*if(StringUtils.isNotBlank(materialIN.getGoodCode())){
 			queryWrapper.like("good_code",materialIN.getGoodCode());
 			queryWrapper.like("good_code",materialIN.getGoodCode());
 		}
 		}
 		if(StringUtils.isNotBlank(materialIN.getStartTime())){
 		if(StringUtils.isNotBlank(materialIN.getStartTime())){
@@ -201,12 +221,12 @@ public class MaterialINController {
 		}
 		}
 		if(StringUtils.isNotBlank(materialIN.getPurchaseContractId())){
 		if(StringUtils.isNotBlank(materialIN.getPurchaseContractId())){
 			queryWrapper.eq("purchase_contract_id",materialIN.getPurchaseContractId());
 			queryWrapper.eq("purchase_contract_id",materialIN.getPurchaseContractId());
-		}
+		}*/
 		queryWrapper.eq("audit_status","3");
 		queryWrapper.eq("audit_status","3");
-		List<MaterialIN> pageList = materialINService.list( queryWrapper);*/
+		List<MaterialIN> pageList = materialINService.list( queryWrapper);
 
 
 
 
-		List<ArrivalRecordExcelExportVO> pageList = materialINService.queryArrivalRecordByList(materialIN);
+		//List<ArrivalRecordExcelExportVO> pageList = materialINService.queryArrivalRecordByList(materialIN);
 
 
 		result.setSuccess(true);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		result.setResult(pageList);

@@ -45,12 +45,10 @@ public class MaterialIN {
 	private String inOrder;
 	private String inOrder;
 	/**采购合同*/
 	/**采购合同*/
 	@Excel(name = "采购合同", width = 15)
 	@Excel(name = "采购合同", width = 15)
-    @ApiModelProperty(value = "采购合同")
 	@Dict(dictTable = "erp_purchase_contract", dicCode="id", dicText = "contract_code")
 	@Dict(dictTable = "erp_purchase_contract", dicCode="id", dicText = "contract_code")
 	private String purchaseContractId;
 	private String purchaseContractId;
 	/**分销合同*/
 	/**分销合同*/
 	@Excel(name = "分销合同", width = 15)
 	@Excel(name = "分销合同", width = 15)
-    @ApiModelProperty(value = "分销合同")
 	@Dict(dictTable = "erp_distribut_contract", dicCode="id", dicText = "contract_code")
 	@Dict(dictTable = "erp_distribut_contract", dicCode="id", dicText = "contract_code")
 	private String distributContractId;
 	private String distributContractId;
 	/**到货时间*/
 	/**到货时间*/
@@ -88,7 +86,6 @@ public class MaterialIN {
     @ApiModelProperty(value = "计量单位")
     @ApiModelProperty(value = "计量单位")
 	private String measuringUnit;
 	private String measuringUnit;
 	/**数量*/
 	/**数量*/
-	@Excel(name = "数量", width = 15)
     @ApiModelProperty(value = "数量")
     @ApiModelProperty(value = "数量")
 	private String purchaseNum;
 	private String purchaseNum;
 
 
@@ -108,15 +105,12 @@ public class MaterialIN {
     @ApiModelProperty(value = "货号")
     @ApiModelProperty(value = "货号")
 	private String goodCode;
 	private String goodCode;
 	/**采购单价*/
 	/**采购单价*/
-	@Excel(name = "采购单价", width = 15)
     @ApiModelProperty(value = "采购单价")
     @ApiModelProperty(value = "采购单价")
 	private String purchasePrice;
 	private String purchasePrice;
 	/**分销单价*/
 	/**分销单价*/
-	@Excel(name = "分销单价", width = 15)
     @ApiModelProperty(value = "分销单价")
     @ApiModelProperty(value = "分销单价")
 	private String distributPrice;
 	private String distributPrice;
 	/**采购总价*/
 	/**采购总价*/
-	@Excel(name = "采购总价", width = 15)
     @ApiModelProperty(value = "采购总价")
     @ApiModelProperty(value = "采购总价")
 	private String purchaseTotalPrice;
 	private String purchaseTotalPrice;
 
 
@@ -124,7 +118,6 @@ public class MaterialIN {
 	@ApiModelProperty(value = "物料数量")
 	@ApiModelProperty(value = "物料数量")
 	private String materialNum;
 	private String materialNum;
 	/**分销总价*/
 	/**分销总价*/
-	@Excel(name = "分销总价", width = 15)
     @ApiModelProperty(value = "分销总价")
     @ApiModelProperty(value = "分销总价")
 	private String distributTotalPrice;
 	private String distributTotalPrice;
 	/**税额*/
 	/**税额*/
@@ -132,11 +125,9 @@ public class MaterialIN {
     @ApiModelProperty(value = "税额")
     @ApiModelProperty(value = "税额")
 	private String taxAmount;
 	private String taxAmount;
 	/**价税合计*/
 	/**价税合计*/
-	@Excel(name = "价税合计", width = 15)
     @ApiModelProperty(value = "价税合计")
     @ApiModelProperty(value = "价税合计")
 	private String totalPriceTax;
 	private String totalPriceTax;
 	/**分享地址*/
 	/**分享地址*/
-	@Excel(name = "分享地址", width = 15)
     @ApiModelProperty(value = "分享地址")
     @ApiModelProperty(value = "分享地址")
 	private String shareUrl;
 	private String shareUrl;
 	/**确认状态：0 未确认 1  部分确认 2 全部确认*/
 	/**确认状态：0 未确认 1  部分确认 2 全部确认*/

@@ -22,4 +22,11 @@ public interface DistributContractMapper extends BaseMapper<DistributContract> {
      * @param id
      * @param id
      */
      */
     void changePurchaseContract(@Param("id")  String id);
     void changePurchaseContract(@Param("id")  String id);
+
+    /**
+     *  根据code 获取ids集合
+     * @param contractCode
+     * @return
+     */
+    List<String> selectIdsByCode(@Param("contractCode") String contractCode);
 }
 }

@@ -26,4 +26,6 @@ public interface ERPPurchaseContractMapper extends BaseMapper<ERPPurchaseContrac
      * @param contractId
      * @param contractId
      */
      */
     void changePurchaseContract(@Param("contractId") String contractId);
     void changePurchaseContract(@Param("contractId") String contractId);
+
+    List<String> selectIdsByCode(@Param("contractCode") String contractCode);
 }
 }

@@ -11,4 +11,9 @@
           update erp_distribut_contract set use_flag =1 where id = #{id}
           update erp_distribut_contract set use_flag =1 where id = #{id}
     </update>
     </update>
 
 
+
+    <select id="selectIdsByCode" resultType="java.lang.String">
+        select id  from erp_distribut_contract where contract_code like CONCAT('%',#{contractCode},'%')
+    </select>
+
 </mapper>
 </mapper>

@@ -16,4 +16,9 @@
         update erp_purchase_contract  set use_flag  = 1  where id = #{contractId}
         update erp_purchase_contract  set use_flag  = 1  where id = #{contractId}
     </update>
     </update>
 
 
+
+    <select id="selectIdsByCode" resultType="java.lang.String">
+        select id  from erp_purchase_contract where contract_code like CONCAT('%',#{contractCode},'%')
+    </select>
+
 </mapper>
 </mapper>

@@ -31,7 +31,7 @@
                 and mi.supplier_id  = #{supplierId}
                 and mi.supplier_id  = #{supplierId}
             </if>
             </if>
         </where>
         </where>
-        order by arrive_time desc
+        order by mi.arrive_time desc
     </select>
     </select>
     <!--获取入库审批列表：根据部门、采购合同、供应商、药剂分组搜索 -->
     <!--获取入库审批列表：根据部门、采购合同、供应商、药剂分组搜索 -->
     <select id="selectAuditMaterialINByPage" resultType="com.skua.modules.erp.vo.ArrivalRecordExcelExportVO">
     <select id="selectAuditMaterialINByPage" resultType="com.skua.modules.erp.vo.ArrivalRecordExcelExportVO">

@@ -68,4 +68,11 @@ public interface IDistributContractService extends IService<DistributContract> {
      * @param distributContractVO
      * @param distributContractVO
      */
      */
     String changePurchaseContract(DistributContractVO distributContractVO);
     String changePurchaseContract(DistributContractVO distributContractVO);
+
+    /***
+     * 根据code 获取ids集合
+     * @param contractCode
+     * @return
+     */
+    List<String> selectIdsByCode(String contractCode);
 }
 }

@@ -93,5 +93,10 @@ public interface IERPPurchaseContractService extends IService<ERPPurchaseContrac
      */
      */
     List<ERPPurchaseContract> getListByDistributId(MaterialSearchVO materialSearchVO);
     List<ERPPurchaseContract> getListByDistributId(MaterialSearchVO materialSearchVO);
 
 
-
+    /**
+     * 根据code 获取ids集合
+     * @param contractCode
+     * @return
+     */
+    List<String> selectIdsByCode(String contractCode);
 }
 }

@@ -152,6 +152,14 @@ public class DistributContractServiceImpl extends ServiceImpl<DistributContractM
         distributContractVO.setOldContractId(oldContractId);//保存变更前的的合同编号
         distributContractVO.setOldContractId(oldContractId);//保存变更前的的合同编号
         return this.updateDistributContractVO(distributContractVO);
         return this.updateDistributContractVO(distributContractVO);
     }
     }
+    /***
+     * 根据code 获取ids集合
+     * @param contractCode
+     * @return
+     */
+    public List<String> selectIdsByCode(String contractCode){
+        return  baseMapper.selectIdsByCode( contractCode);
+    }
 
 
     /***
     /***
      * 根据所属厂长、以及goodcode校验是否存在
      * 根据所属厂长、以及goodcode校验是否存在

@@ -269,6 +269,15 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr
     public List<ERPPurchaseContract> getListByDistributId(MaterialSearchVO materialSearchVO){
     public List<ERPPurchaseContract> getListByDistributId(MaterialSearchVO materialSearchVO){
         return this.baseMapper.getListByDistributId(materialSearchVO);
         return this.baseMapper.getListByDistributId(materialSearchVO);
     }
     }
+    /**
+     * 根据code 获取ids集合
+     * @param contractCode
+     * @return
+     */
+    public List<String> selectIdsByCode(String contractCode){
+        return this.baseMapper.selectIdsByCode(contractCode);
+    }
+
     /***
     /***
      * 同步入库
      * 同步入库
      * @param purchaseContractVO
      * @param purchaseContractVO