kangwei：药剂入库物料验收单

@@ -377,34 +377,7 @@ public class ErpSettlementController {
 		return result;
 	}
 
-  /*  @AutoLog(value = "药剂结算单详情-导出：(供应商)送货单以及物资验收单")
-    @ApiOperation(value="药剂结算单详情-导出：（供应商）送货单以及物资验收单", notes="药剂结算单详情-导出：送货单以及物资验收单")
-    @GetMapping(value = "/exportSupplierSupplierFormPDF")
-    public Result<ErpSettlementFormVO> exportSupplierSupplierFormPDF(@RequestParam(name="id",required=true) String id) {
-        Result<ErpSettlementFormVO> result = new Result<ErpSettlementFormVO>();
-		ErpSettlementFormVO erpSettlement = erpSettlementService.querySupplierSettlementFormById(id);
-        if(erpSettlement==null) {
-            result.error500("未找到对应实体");
-        }else {
-            result.setResult(erpSettlement);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-	@AutoLog(value = "药剂结算单详情-导出：(供应商)送货单以及物资验收单")
-	@ApiOperation(value="药剂结算单详情-导出：（供应商）送货单以及物资验收单", notes="药剂结算单详情-导出：送货单以及物资验收单")
-	@GetMapping(value = "/exportWaterDepartSupplierFormPDF")
-	public Result<ErpSettlementFormVO> exportWaterDepartSupplierFormPDF(@RequestParam(name="id",required=true) String id) {
-		Result<ErpSettlementFormVO> result = new Result<ErpSettlementFormVO>();
-		ErpSettlementFormVO erpSettlement = erpSettlementService.queryWaterDepartSettlementFormById(id);
-		if(erpSettlement==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(erpSettlement);
-			result.setSuccess(true);
-		}
-		return result;
-	}*/
+
 
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(ErpSettlement erpSettlement,HttpServletRequest request, HttpServletResponse response) {

@@ -110,8 +110,8 @@ public class MaterialAcceptanceFormController {
 			if(StringUtils.isNotBlank(materialAcceptanceForm.getSenderSign()) && StringUtils.isNotBlank(materialAcceptanceForm.getReceiverSign()) ){
 				materialAcceptanceForm.setConfirmStatus("9");
 			}
-			materialAcceptanceFormService.save(materialAcceptanceForm);
-
+			//materialAcceptanceFormService.save(materialAcceptanceForm);
+			materialAcceptanceFormService.saveOrUpdateMaterialAcceptanceForm(materialAcceptanceForm);
 			MaterialIN  materialIN =materialINService.getById(materialAcceptanceForm.getId());
 			materialIN.setConfirmStatus(materialAcceptanceForm.getConfirmStatus());
 			materialINService.updateById( materialIN);
@@ -181,16 +181,17 @@ public class MaterialAcceptanceFormController {
 	 * @author 开发者姓名, 开发时间
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
 	 */
-	@AutoLog(value = "erp--物料验收单-通过id查询")
-	@ApiOperation(value="erp--物料验收单-通过id查询", notes="erp--物料验收单-通过id查询")
+	@AutoLog(value = "erp--物料验收单-通过药剂入库编号id查询")
+	@ApiOperation(value="erp--物料验收单-通过药剂入库编号id查询", notes="erp--物料验收单-通过药剂入库编号id查询")
 	@GetMapping(value = "/queryById")
 	public Result<MaterialAcceptanceForm> queryById(@RequestParam(name="id",required=true) String id) {
 		Result<MaterialAcceptanceForm> result = new Result<MaterialAcceptanceForm>();
-		MaterialAcceptanceForm materialAcceptanceForm = materialAcceptanceFormService.queryById(id);
+		MaterialAcceptanceForm materialAcceptanceForm = materialAcceptanceFormService.queryByMaterialInId(id);
 		if(materialAcceptanceForm==null) {
 			//result.error500("未找到对应实体");
 			materialAcceptanceForm = new  MaterialAcceptanceForm();
-			materialAcceptanceForm.setId(id);
+			//materialAcceptanceForm.setId(id);
+			materialAcceptanceForm.setMaterialInId(id);
 		}
 		result.setResult(materialAcceptanceForm);
 		result.setSuccess(true);
@@ -222,7 +223,8 @@ public class MaterialAcceptanceFormController {
 		if(StringUtils.isNotEmpty(materialAcceptanceForm.getSenderSign()) && StringUtils.isNotEmpty(materialAcceptanceForm.getReceiverSign()) ){
 			materialAcceptanceForm.setConfirmStatus("9");
 		}
-		MaterialAcceptanceForm acceptanceForm = materialAcceptanceFormService.queryById(materialAcceptanceForm.getId());
+
+		MaterialAcceptanceForm acceptanceForm = materialAcceptanceFormService.queryByMaterialInId(materialAcceptanceForm.getId());
 		if(acceptanceForm==null) {
 			//result.error500("未找到对应实体");
 			materialAcceptanceFormService.save(materialAcceptanceForm);
@@ -249,6 +251,7 @@ public class MaterialAcceptanceFormController {
 			result.error500("未找到对应实体");
 		}else {
 			acceptanceForm.setConfirmStatus("1");
+			acceptanceForm.setId(materialAcceptanceFormEntity.getId());
 			boolean ok = materialAcceptanceFormService.updateById(acceptanceForm);
 			//TODO 返回false说明什么？
 			if(ok) {
@@ -257,12 +260,6 @@ public class MaterialAcceptanceFormController {
 		}
 		return result;
 	}
-
-
-
-
-
-
 	/**
 	 * <pre>
 	 * 	 导出excel

@@ -28,8 +28,12 @@ public class MaterialAcceptanceForm {
 
 	/**主键*/
 	@TableId(type = IdType.ID_WORKER_STR)
-    @ApiModelProperty(value = "入库单号")
+    @ApiModelProperty(value = "验收单单号")
 	private String id;
+
+	@ApiModelProperty(value = "药剂入库单号")
+	private String materialInId;
+
 	/**所属机构*/
 	@Excel(name = "所属机构", width = 15)
 	@ApiModelProperty(value = "所属机构")

@@ -35,8 +35,5 @@ public interface ErpSettlementMapper extends BaseMapper<ErpSettlement> {
     @Anonymous
     @Select("select  * from erp_settlement  ${ew.customSqlSegment}")
     IPage<ErpSettlement> querySettlementPageBySupplier(Page<ErpSettlement> page, @Param(Constants.WRAPPER) QueryWrapper<ErpSettlement> queryWrapper);
-    //（供应商）送货单以及物资验收单
-   /// List<ErpSettlementItemVO> querySupplierSettlementFormById(@Param("id")String id);
-    //（水厂） 送货单以及物资验收单
-  //  List<ErpSettlementItemVO> queryWaterDepartSettlementFormById(@Param("id")String id);
+
 }

@@ -28,4 +28,6 @@ public interface MaterialAcceptanceFormMapper extends BaseMapper<MaterialAccepta
     void updateMaterialINConfirmStatus(@Param("materialInId") String materialInId, @Param("confirmStatus")String confirmStatus);
     @Anonymous
     public MaterialAcceptanceForm queryById(@Param("id") String id);
+    @Anonymous
+    MaterialAcceptanceForm queryByMaterialInId(@Param("materialInId") String materialInId);
 }

@@ -17,7 +17,7 @@
         left join sys_depart d on d.id = mi.depart_id
         left join erp_purchase_material pm on (pm.contract_id =si.purchase_contract_id and pm.good_code = si.good_code  )
          left join  equipment_sparepart_supplies  ss on si.sparepart_id = ss.id
-        left join erp_material_acceptance_form  mf on mf.id = si.material_in_id
+        left join erp_material_acceptance_form  mf on mf.material_in_id = si.material_in_id
         left join erp_purchase_contract pc on  si.purchase_contract_id = pc.id
         left join ajh_supplier_manage sm on sm.id = pm.supplier_id
      where si.settlement_id = #{settlementId}
@@ -33,7 +33,7 @@
             left join erp_material_in mi on mi.id = si.material_in_id
           left join sys_depart d on d.id = mi.depart_id
 
-           left join erp_material_acceptance_form  mf on mf.id = si.material_in_id
+           left join erp_material_acceptance_form  mf on mf.material_in_id = si.material_in_id
            left join erp_distribut_contract dc on  si.distribut_contract_id = dc.id
 					 left join  equipment_sparepart_supplies  ss on si.sparepart_id = ss.id
             left join erp_distribut_material dm on (dm.contract_id =si.distribut_contract_id and dm.good_code = si.good_code  )

@@ -23,7 +23,7 @@
 		  left join sys_depart d on d.id = mi.depart_id
 		  left join  equipment_sparepart_supplies  ss on mi.sparepart_id = ss.id
 		  left join erp_purchase_material pm on (pm.contract_id =mi.purchase_contract_id and pm.good_code = mi.good_code  )
-          left join erp_material_acceptance_form  mf on mf.id = mi.id
+          left join erp_material_acceptance_form  mf on mf.material_in_id = mi.id
            left join ajh_supplier_manage sm on pm.supplier_id = sm.id
         where mi.audit_status = 3
             and mi.id in (${ids})
@@ -53,35 +53,11 @@
 		  left join sys_depart d on d.id = mi.depart_id
 		    left join  equipment_sparepart_supplies  ss on mi.sparepart_id = ss.id
 		  left join erp_purchase_material pm on (pm.contract_id =mi.purchase_contract_id and pm.good_code = mi.good_code  )
-          left join erp_material_acceptance_form  mf on mf.id = mi.id
+          left join erp_material_acceptance_form  mf on mf.material_in_id = mi.id
         where mi.audit_status = 3
           and mi.id in (${ids})
         order by mi.arrive_time asc
     </select>
 
-    <select id="querySupplierSettlementFormById" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
-        select d.depart_name,pc.project_name ,pc.contract_code,pc.contract_name,sm.supp_name as supplier_name,mi.arrive_time, mf.jishu_file_path,  mf.appearance_info,  mf.matched_info ,mf.handle_msg,maf.appearance_info ,maf.matched_info ,maf.handle_msg ,maf.sender_sign ,maf.receiver_sign ,aaa.*
-         from (
-         select si.sparepart_name,si.material_num,si.specification,si.measuring_unit,s.purchase_contract_id,s.supplier_id,si.material_in_id
-              from erp_settlement s ,erp_settlement_item si  where s.id = si.settlement_id and s.id = #{id}
-         )aaa
-        left join erp_purchase_contract pc on aaa.purchase_contract_id = pc.id
-        left join ajh_supplier_manage sm on  aaa.supplier_id = sm.id
-        left join erp_material_in mi on mi.id = aaa.material_in_id
-        left join erp_material_acceptance_form  maf on  maf.id= aaa.material_in_id
-        left join sys_depart d on d.id = mi.depart_id
-    </select>
 
-    <select id="queryWaterDepartSettlementFormById" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
-        select d.depart_name,dc.contract_code,dc.contract_name , dc.project_name ,mi.arrive_time,mf.jishu_file_path,  mf.appearance_info,  mf.matched_info ,mf.handle_msg, maf.appearance_info ,maf.matched_info ,maf.handle_msg ,maf.sender_sign ,maf.receiver_sign ,aaa.*
-         from (
-         select si.sparepart_name,si.material_num,si.specification,si.measuring_unit,
-        s.distribut_contract_id,s.supplier_id,si.material_in_id
-        from erp_settlement s ,erp_settlement_item si  where s.id = si.settlement_id and s.id = #{id}
-         )aaa
-        left join erp_distribut_contract dc on aaa.distribut_contract_id = dc.id
-        left join erp_material_in mi on mi.id = aaa.material_in_id
-        left join erp_material_acceptance_form  maf on  maf.id= aaa.material_in_id
-        left join sys_depart d on d.id = mi.depart_id
-    </select>
 </mapper>

@@ -6,6 +6,11 @@
     <select id="queryById" resultType="com.skua.modules.erp.entity.MaterialAcceptanceForm">
         select  * from erp_material_acceptance_form where id = #{id}
     </select>
+
+
+    <select id="queryByMaterialInId" resultType="com.skua.modules.erp.entity.MaterialAcceptanceForm">
+        select  * from erp_material_acceptance_form where material_in_id = #{materialInId}  order by create_time   limit 1
+    </select>
     <select id="queryArrivalRecordByList" resultType="com.skua.modules.erp.entity.MaterialAcceptanceForm">
         select  mi.arrive_time ,   maf.*  from erp_material_in mi ,erp_material_acceptance_form  maf
         where mi.id = maf.id

@@ -64,9 +64,5 @@ public interface IErpSettlementService extends IService<ErpSettlement> {
      */
     IPage<ErpSettlement> querySettlementPageBySupplier(Page<ErpSettlement> page, QueryWrapper<ErpSettlement> queryWrapper);
 
-    // （供应商）送货单以及物资验收单
-   // ErpSettlementFormVO querySupplierSettlementFormById(String id);
-    //（水厂） 送货单以及物资验收单
-   // ErpSettlementFormVO queryWaterDepartSettlementFormById(String id);
 
 }

@@ -22,4 +22,6 @@ public interface IMaterialAcceptanceFormService extends IService<MaterialAccepta
     void saveOrUpdateMaterialAcceptanceForm(MaterialAcceptanceForm materialAcceptanceForm);
 
     MaterialAcceptanceForm queryById(String id);
+
+    MaterialAcceptanceForm queryByMaterialInId(String materialInId);
 }

@@ -229,40 +229,5 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E
     public List<ErpSettlementItemVO> queryWaterDepartSettlementByMaterialIds( String materialInIds){
         return  this.baseMapper.queryWaterDepartSettlementByMaterialIds( materialInIds );
     }
-   /* // 送货单以及物资验收单
-    public ErpSettlementFormVO querySupplierSettlementFormById(String id){
-        List<ErpSettlementItemVO> itemList =  this.baseMapper.querySupplierSettlementFormById( id );
-        ErpSettlementFormVO  erpSettlementFormVO = new ErpSettlementFormVO();
-        if(itemList != null && !itemList.isEmpty()){
-            for(ErpSettlementItemVO  settlementFormVO: itemList){
-                erpSettlementFormVO.setContractCode(settlementFormVO.getContractCode());
-                erpSettlementFormVO.setDepartName(settlementFormVO.getDepartName());
-                erpSettlementFormVO.setProjectName(settlementFormVO.getProjectName());
-                erpSettlementFormVO.setSparepartName(settlementFormVO.getSparepartName());
-                erpSettlementFormVO.setSpecification(settlementFormVO.getSpecification());
-                erpSettlementFormVO.setSupplierName(settlementFormVO.getSupplierName());
-                //erpSettlementFormVO.setSparepartTypeName(settlementFormVO.getSparepartName());
-            }
-        }
-        erpSettlementFormVO.setItemList(itemList );
-        return erpSettlementFormVO;
-    }
-    //（水厂） 送货单以及物资验收单
-    public ErpSettlementFormVO queryWaterDepartSettlementFormById(String id){
-        List<ErpSettlementItemVO> itemList =  this.baseMapper.queryWaterDepartSettlementFormById( id );
-        ErpSettlementFormVO  erpSettlementFormVO = new ErpSettlementFormVO();
-        if(itemList != null && !itemList.isEmpty()){
-            for(ErpSettlementItemVO  settlementFormVO: itemList){
-                erpSettlementFormVO.setContractCode(settlementFormVO.getContractCode());
-                erpSettlementFormVO.setDepartName(settlementFormVO.getDepartName());
-                erpSettlementFormVO.setProjectName(settlementFormVO.getProjectName());
-                erpSettlementFormVO.setSparepartName(settlementFormVO.getSparepartName());
-                erpSettlementFormVO.setSpecification(settlementFormVO.getSpecification());
-                erpSettlementFormVO.setSupplierName(settlementFormVO.getSupplierName());
-                //erpSettlementFormVO.setSparepartTypeName(settlementFormVO.getSparepartName());
-            }
-        }
-        erpSettlementFormVO.setItemList(itemList );
-        return erpSettlementFormVO;
-    }*/
+
 }

@@ -29,7 +29,7 @@ public class MaterialAcceptanceFormServiceImpl extends ServiceImpl<MaterialAccep
     @Transactional
     @Override
     public void saveOrUpdateMaterialAcceptanceForm(MaterialAcceptanceForm materialAcceptanceForm) {
-        MaterialAcceptanceForm materialAcceptanceFormEntity = baseMapper.queryById(materialAcceptanceForm.getId());
+        MaterialAcceptanceForm materialAcceptanceFormEntity = baseMapper.queryByMaterialInId(materialAcceptanceForm.getId());
         if(materialAcceptanceFormEntity==null) {
             //result.error500("未找到对应实体");
             baseMapper.insert(materialAcceptanceForm);
@@ -43,4 +43,8 @@ public class MaterialAcceptanceFormServiceImpl extends ServiceImpl<MaterialAccep
     public MaterialAcceptanceForm queryById(String id){
         return baseMapper.queryById(id);
     }
+
+    public MaterialAcceptanceForm queryByMaterialInId(String materialInId){
+        return baseMapper.queryByMaterialInId(materialInId);
+    }
 }

@@ -288,7 +288,8 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
         }
         this.baseMapper.insert(materialIN);
         MaterialAcceptanceForm materialAcceptanceForm = new MaterialAcceptanceForm();
-        materialAcceptanceForm.setId( materialIN.getId() ) ;
+        //materialAcceptanceForm.setId( materialIN.getId() ) ;
+        materialAcceptanceForm.setMaterialInId( materialIN.getId() );
         materialAcceptanceForm.setDepartId(materialIN.getDepartId());
         materialAcceptanceForm.setGoodCode(materialIN.getGoodCode());
         materialAcceptanceForm.setPurchaseContractCode(materialIN.getPurchaseContractCode());
@@ -324,8 +325,8 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
 
 
         int index = this.baseMapper.updateById(materialIN );
-        MaterialAcceptanceForm materialAcceptanceForm = new MaterialAcceptanceForm();
-        materialAcceptanceForm.setId( materialIN.getId() ) ;
+        MaterialAcceptanceForm materialAcceptanceForm = materialAcceptanceFormService.queryByMaterialInId(materialIN.getId());
+        materialAcceptanceForm.setMaterialInId( materialIN.getId() );
         materialAcceptanceForm.setDepartId(materialIN.getDepartId());
         materialAcceptanceForm.setGoodCode(materialIN.getGoodCode());
         materialAcceptanceForm.setPurchaseContractCode(materialIN.getPurchaseContractCode());