Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
6698c57d 由 康伟
选项

kangwei：药剂入库物料验收单

1 个父辈 284fcc72
内嵌 并排
正在显示 13 个修改的文件 包含 40 行增加 和 118 行删除
sk-module-biz/src/main/java/com/skua/modules/erp/controller/ErpSettlementController.java
...@@ -377,34 +377,7 @@ public class ErpSettlementController { ...@@ -377,34 +377,7 @@ public class ErpSettlementController {
377 return result; 377 return result;
378 } 378 }
379 379
380 /* @AutoLog(value = "药剂结算单详情-导出：(供应商)送货单以及物资验收单") 380
381 @ApiOperation(value="药剂结算单详情-导出：（供应商）送货单以及物资验收单", notes="药剂结算单详情-导出：送货单以及物资验收单")
382 @GetMapping(value = "/exportSupplierSupplierFormPDF")
383 public Result<ErpSettlementFormVO> exportSupplierSupplierFormPDF(@RequestParam(name="id",required=true) String id) {
384 Result<ErpSettlementFormVO> result = new Result<ErpSettlementFormVO>();
385 ErpSettlementFormVO erpSettlement = erpSettlementService.querySupplierSettlementFormById(id);
386 if(erpSettlement==null) {
387 result.error500("未找到对应实体");
388 }else {
389 result.setResult(erpSettlement);
390 result.setSuccess(true);
391 }
392 return result;
393 }
394 @AutoLog(value = "药剂结算单详情-导出：(供应商)送货单以及物资验收单")
395 @ApiOperation(value="药剂结算单详情-导出：（供应商）送货单以及物资验收单", notes="药剂结算单详情-导出：送货单以及物资验收单")
396 @GetMapping(value = "/exportWaterDepartSupplierFormPDF")
397 public Result<ErpSettlementFormVO> exportWaterDepartSupplierFormPDF(@RequestParam(name="id",required=true) String id) {
398 Result<ErpSettlementFormVO> result = new Result<ErpSettlementFormVO>();
399 ErpSettlementFormVO erpSettlement = erpSettlementService.queryWaterDepartSettlementFormById(id);
400 if(erpSettlement==null) {
401 result.error500("未找到对应实体");
402 }else {
403 result.setResult(erpSettlement);
404 result.setSuccess(true);
405 }
406 return result;
407 }*/
408 381
409 @RequestMapping(value = "/exportXls") 382 @RequestMapping(value = "/exportXls")
410 public ModelAndView exportXls(ErpSettlement erpSettlement,HttpServletRequest request, HttpServletResponse response) { 383 public ModelAndView exportXls(ErpSettlement erpSettlement,HttpServletRequest request, HttpServletResponse response) {
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/MaterialAcceptanceFormController.java
...@@ -110,8 +110,8 @@ public class MaterialAcceptanceFormController { ...@@ -110,8 +110,8 @@ public class MaterialAcceptanceFormController {
110 if(StringUtils.isNotBlank(materialAcceptanceForm.getSenderSign()) && StringUtils.isNotBlank(materialAcceptanceForm.getReceiverSign()) ){ 110 if(StringUtils.isNotBlank(materialAcceptanceForm.getSenderSign()) && StringUtils.isNotBlank(materialAcceptanceForm.getReceiverSign()) ){
111 materialAcceptanceForm.setConfirmStatus("9"); 111 materialAcceptanceForm.setConfirmStatus("9");
112 } 112 }
113 materialAcceptanceFormService.save(materialAcceptanceForm); 113 //materialAcceptanceFormService.save(materialAcceptanceForm);
114 114 materialAcceptanceFormService.saveOrUpdateMaterialAcceptanceForm(materialAcceptanceForm);
115 MaterialIN materialIN =materialINService.getById(materialAcceptanceForm.getId()); 115 MaterialIN materialIN =materialINService.getById(materialAcceptanceForm.getId());
116 materialIN.setConfirmStatus(materialAcceptanceForm.getConfirmStatus()); 116 materialIN.setConfirmStatus(materialAcceptanceForm.getConfirmStatus());
117 materialINService.updateById( materialIN); 117 materialINService.updateById( materialIN);
...@@ -181,16 +181,17 @@ public class MaterialAcceptanceFormController { ...@@ -181,16 +181,17 @@ public class MaterialAcceptanceFormController {
181 * @author 开发者姓名, 开发时间 181 * @author 开发者姓名, 开发时间
182 * @Description: TODO(这里描述这个方法的需求变更情况) 182 * @Description: TODO(这里描述这个方法的需求变更情况)
183 */ 183 */
184 @AutoLog(value = "erp--物料验收单-通过id查询") 184 @AutoLog(value = "erp--物料验收单-通过药剂入库编号id查询")
185 @ApiOperation(value="erp--物料验收单-通过id查询", notes="erp--物料验收单-通过id查询") 185 @ApiOperation(value="erp--物料验收单-通过药剂入库编号id查询", notes="erp--物料验收单-通过药剂入库编号id查询")
186 @GetMapping(value = "/queryById") 186 @GetMapping(value = "/queryById")
187 public Result<MaterialAcceptanceForm> queryById(@RequestParam(name="id",required=true) String id) { 187 public Result<MaterialAcceptanceForm> queryById(@RequestParam(name="id",required=true) String id) {
188 Result<MaterialAcceptanceForm> result = new Result<MaterialAcceptanceForm>(); 188 Result<MaterialAcceptanceForm> result = new Result<MaterialAcceptanceForm>();
189 MaterialAcceptanceForm materialAcceptanceForm = materialAcceptanceFormService.queryById(id); 189 MaterialAcceptanceForm materialAcceptanceForm = materialAcceptanceFormService.queryByMaterialInId(id);
190 if(materialAcceptanceForm==null) { 190 if(materialAcceptanceForm==null) {
191 //result.error500("未找到对应实体"); 191 //result.error500("未找到对应实体");
192 materialAcceptanceForm = new MaterialAcceptanceForm(); 192 materialAcceptanceForm = new MaterialAcceptanceForm();
193 materialAcceptanceForm.setId(id); 193 //materialAcceptanceForm.setId(id);
194 materialAcceptanceForm.setMaterialInId(id);
194 } 195 }
195 result.setResult(materialAcceptanceForm); 196 result.setResult(materialAcceptanceForm);
196 result.setSuccess(true); 197 result.setSuccess(true);
...@@ -222,7 +223,8 @@ public class MaterialAcceptanceFormController { ...@@ -222,7 +223,8 @@ public class MaterialAcceptanceFormController {
222 if(StringUtils.isNotEmpty(materialAcceptanceForm.getSenderSign()) && StringUtils.isNotEmpty(materialAcceptanceForm.getReceiverSign()) ){ 223 if(StringUtils.isNotEmpty(materialAcceptanceForm.getSenderSign()) && StringUtils.isNotEmpty(materialAcceptanceForm.getReceiverSign()) ){
223 materialAcceptanceForm.setConfirmStatus("9"); 224 materialAcceptanceForm.setConfirmStatus("9");
224 } 225 }
225 MaterialAcceptanceForm acceptanceForm = materialAcceptanceFormService.queryById(materialAcceptanceForm.getId()); 226
227 MaterialAcceptanceForm acceptanceForm = materialAcceptanceFormService.queryByMaterialInId(materialAcceptanceForm.getId());
226 if(acceptanceForm==null) { 228 if(acceptanceForm==null) {
227 //result.error500("未找到对应实体"); 229 //result.error500("未找到对应实体");
228 materialAcceptanceFormService.save(materialAcceptanceForm); 230 materialAcceptanceFormService.save(materialAcceptanceForm);
...@@ -249,6 +251,7 @@ public class MaterialAcceptanceFormController { ...@@ -249,6 +251,7 @@ public class MaterialAcceptanceFormController {
249 result.error500("未找到对应实体"); 251 result.error500("未找到对应实体");
250 }else { 252 }else {
251 acceptanceForm.setConfirmStatus("1"); 253 acceptanceForm.setConfirmStatus("1");
254 acceptanceForm.setId(materialAcceptanceFormEntity.getId());
252 boolean ok = materialAcceptanceFormService.updateById(acceptanceForm); 255 boolean ok = materialAcceptanceFormService.updateById(acceptanceForm);
253 //TODO 返回false说明什么？ 256 //TODO 返回false说明什么？
254 if(ok) { 257 if(ok) {
...@@ -257,12 +260,6 @@ public class MaterialAcceptanceFormController { ...@@ -257,12 +260,6 @@ public class MaterialAcceptanceFormController {
257 } 260 }
258 return result; 261 return result;
259 } 262 }
260
261
262
263
264
265
266 /** 263 /**
267 * <pre> 264 * <pre>
268 * 导出excel 265 * 导出excel
......
sk-module-biz/src/main/java/com/skua/modules/erp/entity/MaterialAcceptanceForm.java
...@@ -28,8 +28,12 @@ public class MaterialAcceptanceForm { ...@@ -28,8 +28,12 @@ public class MaterialAcceptanceForm {
28 28
29 /**主键*/ 29 /**主键*/
30 @TableId(type = IdType.ID_WORKER_STR) 30 @TableId(type = IdType.ID_WORKER_STR)
31 @ApiModelProperty(value = "入库单号") 31 @ApiModelProperty(value = "验收单单号")
32 private String id; 32 private String id;
33
34 @ApiModelProperty(value = "药剂入库单号")
35 private String materialInId;
36
33 /**所属机构*/ 37 /**所属机构*/
34 @Excel(name = "所属机构", width = 15) 38 @Excel(name = "所属机构", width = 15)
35 @ApiModelProperty(value = "所属机构") 39 @ApiModelProperty(value = "所属机构")
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/ErpSettlementMapper.java
...@@ -35,8 +35,5 @@ public interface ErpSettlementMapper extends BaseMapper<ErpSettlement> { ...@@ -35,8 +35,5 @@ public interface ErpSettlementMapper extends BaseMapper<ErpSettlement> {
35 @Anonymous 35 @Anonymous
36 @Select("select * from erp_settlement ${ew.customSqlSegment}") 36 @Select("select * from erp_settlement ${ew.customSqlSegment}")
37 IPage<ErpSettlement> querySettlementPageBySupplier(Page<ErpSettlement> page, @Param(Constants.WRAPPER) QueryWrapper<ErpSettlement> queryWrapper); 37 IPage<ErpSettlement> querySettlementPageBySupplier(Page<ErpSettlement> page, @Param(Constants.WRAPPER) QueryWrapper<ErpSettlement> queryWrapper);
38 //（供应商）送货单以及物资验收单 38
39 /// List<ErpSettlementItemVO> querySupplierSettlementFormById(@Param("id")String id);
40 //（水厂） 送货单以及物资验收单
41 // List<ErpSettlementItemVO> queryWaterDepartSettlementFormById(@Param("id")String id);
42 } 39 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/MaterialAcceptanceFormMapper.java
...@@ -28,4 +28,6 @@ public interface MaterialAcceptanceFormMapper extends BaseMapper<MaterialAccepta ...@@ -28,4 +28,6 @@ public interface MaterialAcceptanceFormMapper extends BaseMapper<MaterialAccepta
28 void updateMaterialINConfirmStatus(@Param("materialInId") String materialInId, @Param("confirmStatus")String confirmStatus); 28 void updateMaterialINConfirmStatus(@Param("materialInId") String materialInId, @Param("confirmStatus")String confirmStatus);
29 @Anonymous 29 @Anonymous
30 public MaterialAcceptanceForm queryById(@Param("id") String id); 30 public MaterialAcceptanceForm queryById(@Param("id") String id);
31 @Anonymous
32 MaterialAcceptanceForm queryByMaterialInId(@Param("materialInId") String materialInId);
31 } 33 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/ErpSettlementItemMapper.xml
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 left join sys_depart d on d.id = mi.depart_id 17 left join sys_depart d on d.id = mi.depart_id
18 left join erp_purchase_material pm on (pm.contract_id =si.purchase_contract_id and pm.good_code = si.good_code ) 18 left join erp_purchase_material pm on (pm.contract_id =si.purchase_contract_id and pm.good_code = si.good_code )
19 left join equipment_sparepart_supplies ss on si.sparepart_id = ss.id 19 left join equipment_sparepart_supplies ss on si.sparepart_id = ss.id
20 left join erp_material_acceptance_form mf on mf.id = si.material_in_id 20 left join erp_material_acceptance_form mf on mf.material_in_id = si.material_in_id
21 left join erp_purchase_contract pc on si.purchase_contract_id = pc.id 21 left join erp_purchase_contract pc on si.purchase_contract_id = pc.id
22 left join ajh_supplier_manage sm on sm.id = pm.supplier_id 22 left join ajh_supplier_manage sm on sm.id = pm.supplier_id
23 where si.settlement_id = #{settlementId} 23 where si.settlement_id = #{settlementId}
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 left join erp_material_in mi on mi.id = si.material_in_id 33 left join erp_material_in mi on mi.id = si.material_in_id
34 left join sys_depart d on d.id = mi.depart_id 34 left join sys_depart d on d.id = mi.depart_id
35 35
36 left join erp_material_acceptance_form mf on mf.id = si.material_in_id 36 left join erp_material_acceptance_form mf on mf.material_in_id = si.material_in_id
37 left join erp_distribut_contract dc on si.distribut_contract_id = dc.id 37 left join erp_distribut_contract dc on si.distribut_contract_id = dc.id
38 left join equipment_sparepart_supplies ss on si.sparepart_id = ss.id 38 left join equipment_sparepart_supplies ss on si.sparepart_id = ss.id
39 left join erp_distribut_material dm on (dm.contract_id =si.distribut_contract_id and dm.good_code = si.good_code ) 39 left join erp_distribut_material dm on (dm.contract_id =si.distribut_contract_id and dm.good_code = si.good_code )
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/ErpSettlementMapper.xml
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 left join sys_depart d on d.id = mi.depart_id 23 left join sys_depart d on d.id = mi.depart_id
24 left join equipment_sparepart_supplies ss on mi.sparepart_id = ss.id 24 left join equipment_sparepart_supplies ss on mi.sparepart_id = ss.id
25 left join erp_purchase_material pm on (pm.contract_id =mi.purchase_contract_id and pm.good_code = mi.good_code ) 25 left join erp_purchase_material pm on (pm.contract_id =mi.purchase_contract_id and pm.good_code = mi.good_code )
26 left join erp_material_acceptance_form mf on mf.id = mi.id 26 left join erp_material_acceptance_form mf on mf.material_in_id = mi.id
27 left join ajh_supplier_manage sm on pm.supplier_id = sm.id 27 left join ajh_supplier_manage sm on pm.supplier_id = sm.id
28 where mi.audit_status = 3 28 where mi.audit_status = 3
29 and mi.id in (${ids}) 29 and mi.id in (${ids})
...@@ -53,35 +53,11 @@ ...@@ -53,35 +53,11 @@
53 left join sys_depart d on d.id = mi.depart_id 53 left join sys_depart d on d.id = mi.depart_id
54 left join equipment_sparepart_supplies ss on mi.sparepart_id = ss.id 54 left join equipment_sparepart_supplies ss on mi.sparepart_id = ss.id
55 left join erp_purchase_material pm on (pm.contract_id =mi.purchase_contract_id and pm.good_code = mi.good_code ) 55 left join erp_purchase_material pm on (pm.contract_id =mi.purchase_contract_id and pm.good_code = mi.good_code )
56 left join erp_material_acceptance_form mf on mf.id = mi.id 56 left join erp_material_acceptance_form mf on mf.material_in_id = mi.id
57 where mi.audit_status = 3 57 where mi.audit_status = 3
58 and mi.id in (${ids}) 58 and mi.id in (${ids})
59 order by mi.arrive_time asc 59 order by mi.arrive_time asc
60 </select> 60 </select>
61 61
62 <select id="querySupplierSettlementFormById" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
63 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.*
64 from (
65 select si.sparepart_name,si.material_num,si.specification,si.measuring_unit,s.purchase_contract_id,s.supplier_id,si.material_in_id
66 from erp_settlement s ,erp_settlement_item si where s.id = si.settlement_id and s.id = #{id}
67 )aaa
68 left join erp_purchase_contract pc on aaa.purchase_contract_id = pc.id
69 left join ajh_supplier_manage sm on aaa.supplier_id = sm.id
70 left join erp_material_in mi on mi.id = aaa.material_in_id
71 left join erp_material_acceptance_form maf on maf.id= aaa.material_in_id
72 left join sys_depart d on d.id = mi.depart_id
73 </select>
74 62
75 <select id="queryWaterDepartSettlementFormById" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
76 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.*
77 from (
78 select si.sparepart_name,si.material_num,si.specification,si.measuring_unit,
79 s.distribut_contract_id,s.supplier_id,si.material_in_id
80 from erp_settlement s ,erp_settlement_item si where s.id = si.settlement_id and s.id = #{id}
81 )aaa
82 left join erp_distribut_contract dc on aaa.distribut_contract_id = dc.id
83 left join erp_material_in mi on mi.id = aaa.material_in_id
84 left join erp_material_acceptance_form maf on maf.id= aaa.material_in_id
85 left join sys_depart d on d.id = mi.depart_id
86 </select>
87 </mapper> 63 </mapper>
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/MaterialAcceptanceFormMapper.xml
...@@ -6,6 +6,11 @@ ...@@ -6,6 +6,11 @@
6 <select id="queryById" resultType="com.skua.modules.erp.entity.MaterialAcceptanceForm"> 6 <select id="queryById" resultType="com.skua.modules.erp.entity.MaterialAcceptanceForm">
7 select * from erp_material_acceptance_form where id = #{id} 7 select * from erp_material_acceptance_form where id = #{id}
8 </select> 8 </select>
9
10
11 <select id="queryByMaterialInId" resultType="com.skua.modules.erp.entity.MaterialAcceptanceForm">
12 select * from erp_material_acceptance_form where material_in_id = #{materialInId} order by create_time limit 1
13 </select>
9 <select id="queryArrivalRecordByList" resultType="com.skua.modules.erp.entity.MaterialAcceptanceForm"> 14 <select id="queryArrivalRecordByList" resultType="com.skua.modules.erp.entity.MaterialAcceptanceForm">
10 select mi.arrive_time , maf.* from erp_material_in mi ,erp_material_acceptance_form maf 15 select mi.arrive_time , maf.* from erp_material_in mi ,erp_material_acceptance_form maf
11 where mi.id = maf.id 16 where mi.id = maf.id
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/IErpSettlementService.java
...@@ -64,9 +64,5 @@ public interface IErpSettlementService extends IService<ErpSettlement> { ...@@ -64,9 +64,5 @@ public interface IErpSettlementService extends IService<ErpSettlement> {
64 */ 64 */
65 IPage<ErpSettlement> querySettlementPageBySupplier(Page<ErpSettlement> page, QueryWrapper<ErpSettlement> queryWrapper); 65 IPage<ErpSettlement> querySettlementPageBySupplier(Page<ErpSettlement> page, QueryWrapper<ErpSettlement> queryWrapper);
66 66
67 // （供应商）送货单以及物资验收单
68 // ErpSettlementFormVO querySupplierSettlementFormById(String id);
69 //（水厂） 送货单以及物资验收单
70 // ErpSettlementFormVO queryWaterDepartSettlementFormById(String id);
71 67
72 } 68 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/IMaterialAcceptanceFormService.java
...@@ -22,4 +22,6 @@ public interface IMaterialAcceptanceFormService extends IService<MaterialAccepta ...@@ -22,4 +22,6 @@ public interface IMaterialAcceptanceFormService extends IService<MaterialAccepta
22 void saveOrUpdateMaterialAcceptanceForm(MaterialAcceptanceForm materialAcceptanceForm); 22 void saveOrUpdateMaterialAcceptanceForm(MaterialAcceptanceForm materialAcceptanceForm);
23 23
24 MaterialAcceptanceForm queryById(String id); 24 MaterialAcceptanceForm queryById(String id);
25
26 MaterialAcceptanceForm queryByMaterialInId(String materialInId);
25 } 27 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/ErpSettlementServiceImpl.java
...@@ -229,40 +229,5 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E ...@@ -229,40 +229,5 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E
229 public List<ErpSettlementItemVO> queryWaterDepartSettlementByMaterialIds( String materialInIds){ 229 public List<ErpSettlementItemVO> queryWaterDepartSettlementByMaterialIds( String materialInIds){
230 return this.baseMapper.queryWaterDepartSettlementByMaterialIds( materialInIds ); 230 return this.baseMapper.queryWaterDepartSettlementByMaterialIds( materialInIds );
231 } 231 }
232 /* // 送货单以及物资验收单 232
233 public ErpSettlementFormVO querySupplierSettlementFormById(String id){
234 List<ErpSettlementItemVO> itemList = this.baseMapper.querySupplierSettlementFormById( id );
235 ErpSettlementFormVO erpSettlementFormVO = new ErpSettlementFormVO();
236 if(itemList != null && !itemList.isEmpty()){
237 for(ErpSettlementItemVO settlementFormVO: itemList){
238 erpSettlementFormVO.setContractCode(settlementFormVO.getContractCode());
239 erpSettlementFormVO.setDepartName(settlementFormVO.getDepartName());
240 erpSettlementFormVO.setProjectName(settlementFormVO.getProjectName());
241 erpSettlementFormVO.setSparepartName(settlementFormVO.getSparepartName());
242 erpSettlementFormVO.setSpecification(settlementFormVO.getSpecification());
243 erpSettlementFormVO.setSupplierName(settlementFormVO.getSupplierName());
244 //erpSettlementFormVO.setSparepartTypeName(settlementFormVO.getSparepartName());
245 }
246 }
247 erpSettlementFormVO.setItemList(itemList );
248 return erpSettlementFormVO;
249 }
250 //（水厂） 送货单以及物资验收单
251 public ErpSettlementFormVO queryWaterDepartSettlementFormById(String id){
252 List<ErpSettlementItemVO> itemList = this.baseMapper.queryWaterDepartSettlementFormById( id );
253 ErpSettlementFormVO erpSettlementFormVO = new ErpSettlementFormVO();
254 if(itemList != null && !itemList.isEmpty()){
255 for(ErpSettlementItemVO settlementFormVO: itemList){
256 erpSettlementFormVO.setContractCode(settlementFormVO.getContractCode());
257 erpSettlementFormVO.setDepartName(settlementFormVO.getDepartName());
258 erpSettlementFormVO.setProjectName(settlementFormVO.getProjectName());
259 erpSettlementFormVO.setSparepartName(settlementFormVO.getSparepartName());
260 erpSettlementFormVO.setSpecification(settlementFormVO.getSpecification());
261 erpSettlementFormVO.setSupplierName(settlementFormVO.getSupplierName());
262 //erpSettlementFormVO.setSparepartTypeName(settlementFormVO.getSparepartName());
263 }
264 }
265 erpSettlementFormVO.setItemList(itemList );
266 return erpSettlementFormVO;
267 }*/
268 } 233 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialAcceptanceFormServiceImpl.java
...@@ -29,7 +29,7 @@ public class MaterialAcceptanceFormServiceImpl extends ServiceImpl<MaterialAccep ...@@ -29,7 +29,7 @@ public class MaterialAcceptanceFormServiceImpl extends ServiceImpl<MaterialAccep
29 @Transactional 29 @Transactional
30 @Override 30 @Override
31 public void saveOrUpdateMaterialAcceptanceForm(MaterialAcceptanceForm materialAcceptanceForm) { 31 public void saveOrUpdateMaterialAcceptanceForm(MaterialAcceptanceForm materialAcceptanceForm) {
32 MaterialAcceptanceForm materialAcceptanceFormEntity = baseMapper.queryById(materialAcceptanceForm.getId()); 32 MaterialAcceptanceForm materialAcceptanceFormEntity = baseMapper.queryByMaterialInId(materialAcceptanceForm.getId());
33 if(materialAcceptanceFormEntity==null) { 33 if(materialAcceptanceFormEntity==null) {
34 //result.error500("未找到对应实体"); 34 //result.error500("未找到对应实体");
35 baseMapper.insert(materialAcceptanceForm); 35 baseMapper.insert(materialAcceptanceForm);
...@@ -43,4 +43,8 @@ public class MaterialAcceptanceFormServiceImpl extends ServiceImpl<MaterialAccep ...@@ -43,4 +43,8 @@ public class MaterialAcceptanceFormServiceImpl extends ServiceImpl<MaterialAccep
43 public MaterialAcceptanceForm queryById(String id){ 43 public MaterialAcceptanceForm queryById(String id){
44 return baseMapper.queryById(id); 44 return baseMapper.queryById(id);
45 } 45 }
46
47 public MaterialAcceptanceForm queryByMaterialInId(String materialInId){
48 return baseMapper.queryByMaterialInId(materialInId);
49 }
46 } 50 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialINServiceImpl.java
...@@ -288,7 +288,8 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia ...@@ -288,7 +288,8 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
288 } 288 }
289 this.baseMapper.insert(materialIN); 289 this.baseMapper.insert(materialIN);
290 MaterialAcceptanceForm materialAcceptanceForm = new MaterialAcceptanceForm(); 290 MaterialAcceptanceForm materialAcceptanceForm = new MaterialAcceptanceForm();
291 materialAcceptanceForm.setId( materialIN.getId() ) ; 291 //materialAcceptanceForm.setId( materialIN.getId() ) ;
292 materialAcceptanceForm.setMaterialInId( materialIN.getId() );
292 materialAcceptanceForm.setDepartId(materialIN.getDepartId()); 293 materialAcceptanceForm.setDepartId(materialIN.getDepartId());
293 materialAcceptanceForm.setGoodCode(materialIN.getGoodCode()); 294 materialAcceptanceForm.setGoodCode(materialIN.getGoodCode());
294 materialAcceptanceForm.setPurchaseContractCode(materialIN.getPurchaseContractCode()); 295 materialAcceptanceForm.setPurchaseContractCode(materialIN.getPurchaseContractCode());
...@@ -324,8 +325,8 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia ...@@ -324,8 +325,8 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
324 325
325 326
326 int index = this.baseMapper.updateById(materialIN ); 327 int index = this.baseMapper.updateById(materialIN );
327 MaterialAcceptanceForm materialAcceptanceForm = new MaterialAcceptanceForm(); 328 MaterialAcceptanceForm materialAcceptanceForm = materialAcceptanceFormService.queryByMaterialInId(materialIN.getId());
328 materialAcceptanceForm.setId( materialIN.getId() ) ; 329 materialAcceptanceForm.setMaterialInId( materialIN.getId() );
329 materialAcceptanceForm.setDepartId(materialIN.getDepartId()); 330 materialAcceptanceForm.setDepartId(materialIN.getDepartId());
330 materialAcceptanceForm.setGoodCode(materialIN.getGoodCode()); 331 materialAcceptanceForm.setGoodCode(materialIN.getGoodCode());
331 materialAcceptanceForm.setPurchaseContractCode(materialIN.getPurchaseContractCode()); 332 materialAcceptanceForm.setPurchaseContractCode(materialIN.getPurchaseContractCode());
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!