no message
							parent
							
								
									3fd035f129
								
							
						
					
					
						commit
						184717674f
					
				| 
						 | 
					@ -191,12 +191,12 @@ public class ReceiveService {
 | 
				
			||||||
        //批量操作
 | 
					        //批量操作
 | 
				
			||||||
        batchUpdateOrInsert(updateToAsnDetail, insertToTask, insertToInventory, updateToInventory);
 | 
					        batchUpdateOrInsert(updateToAsnDetail, insertToTask, insertToInventory, updateToInventory);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //操作日志
 | 
					 | 
				
			||||||
        dataTracerService.addTrace(asn.getAsnId(), DataTracerTypeEnum.ASN, "批量收货:" + joiner.getSussMsg().toString());
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        //刷新入库单
 | 
					        //刷新入库单
 | 
				
			||||||
        asnDetailService.refreshAsn(batchReceiveForm.getAsnId());
 | 
					        asnDetailService.refreshAsn(batchReceiveForm.getAsnId());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //操作日志
 | 
				
			||||||
 | 
					        dataTracerService.addTrace(asn.getAsnId(), DataTracerTypeEnum.ASN, "批量收货:" + joiner.getSussMsg().toString() + joiner.getErrorMsg().toString());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        Long endTime = System.currentTimeMillis();
 | 
					        Long endTime = System.currentTimeMillis();
 | 
				
			||||||
        log.info("批量收货耗时:{}ms", endTime - statrTime);
 | 
					        log.info("批量收货耗时:{}ms", endTime - statrTime);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -293,11 +293,12 @@ public class ReceiveService {
 | 
				
			||||||
        //批量操作
 | 
					        //批量操作
 | 
				
			||||||
        returnUpdateOrInsert(updateToAsnDetail, deleteToTask, updateToInventory, deleteToInventory);
 | 
					        returnUpdateOrInsert(updateToAsnDetail, deleteToTask, updateToInventory, deleteToInventory);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //刷新入库单
 | 
				
			||||||
 | 
					        asnDetailService.refreshAsn(batchReturnForm.getAsnId());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //操作日志
 | 
					        //操作日志
 | 
				
			||||||
        dataTracerService.addTrace(batchReturnForm.getAsnId(), DataTracerTypeEnum.ASN, "批量退货:" + joiner.getSussMsg().toString());
 | 
					        dataTracerService.addTrace(batchReturnForm.getAsnId(), DataTracerTypeEnum.ASN, "批量退货:" + joiner.getSussMsg().toString());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //刷新入库单
 | 
					 | 
				
			||||||
        asnDetailService.refreshAsn(batchReturnForm.getAsnId());
 | 
					 | 
				
			||||||
        Long endTime = System.currentTimeMillis();
 | 
					        Long endTime = System.currentTimeMillis();
 | 
				
			||||||
        log.info("批量退货耗时:{}ms", endTime - statrTime);
 | 
					        log.info("批量退货耗时:{}ms", endTime - statrTime);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -93,7 +93,7 @@ public class AsnService {
 | 
				
			||||||
        asnDao.insert(asnEntity);
 | 
					        asnDao.insert(asnEntity);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //操作记录
 | 
					        //操作记录
 | 
				
			||||||
        dataTracerService.addTrace(asnEntity.getAsnId(), DataTracerTypeEnum.ASN,"新建入库单", null,asnEntity);
 | 
					        dataTracerService.addTrace(asnEntity.getAsnId(), DataTracerTypeEnum.ASN,"新建入库单:"+asnEntity.getAsnNumber(), null,asnEntity);
 | 
				
			||||||
        return ResponseDTO.ok(asnEntity);
 | 
					        return ResponseDTO.ok(asnEntity);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -112,7 +112,7 @@ public class AsnService {
 | 
				
			||||||
        AsnEntity asnEntity = SmartBeanUtil.copy(updateForm, AsnEntity.class);
 | 
					        AsnEntity asnEntity = SmartBeanUtil.copy(updateForm, AsnEntity.class);
 | 
				
			||||||
        asnDao.updateById(asnEntity);
 | 
					        asnDao.updateById(asnEntity);
 | 
				
			||||||
        //业务操作记录
 | 
					        //业务操作记录
 | 
				
			||||||
        dataTracerService.addTrace(updateForm.getAsnId(), DataTracerTypeEnum.ASN,"编辑入库单", exitAsn,asnEntity);
 | 
					        dataTracerService.addTrace(updateForm.getAsnId(), DataTracerTypeEnum.ASN,"编辑入库单:"+asnEntity.getAsnNumber(), exitAsn,asnEntity);
 | 
				
			||||||
        return ResponseDTO.ok(asnEntity);
 | 
					        return ResponseDTO.ok(asnEntity);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -76,12 +76,13 @@ public class AsnDetailService {
 | 
				
			||||||
        AsnDetailEntity asnDetailEntity = SmartBeanUtil.copy(addForm, AsnDetailEntity.class);
 | 
					        AsnDetailEntity asnDetailEntity = SmartBeanUtil.copy(addForm, AsnDetailEntity.class);
 | 
				
			||||||
        asnDetailDao.insert(asnDetailEntity);
 | 
					        asnDetailDao.insert(asnDetailEntity);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //刷新出库单
 | 
				
			||||||
 | 
					        refreshAsn(addForm.getAsnId());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //业务操作记录
 | 
					        //业务操作记录
 | 
				
			||||||
        ItemEntity item = itemDao.selectById(addForm.getItemId());
 | 
					        ItemEntity item = itemDao.selectById(addForm.getItemId());
 | 
				
			||||||
        dataTracerService.addTrace(asnDetailEntity.getAsnId(), DataTracerTypeEnum.ASN, "添加:" + item.getItemCode() + "物料明细", null, asnDetailEntity);
 | 
					        dataTracerService.addTrace(asnDetailEntity.getAsnId(), DataTracerTypeEnum.ASN, "添加:" + item.getItemCode() + "物料明细", null, asnDetailEntity);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //刷新出库单
 | 
					 | 
				
			||||||
        refreshAsn(addForm.getAsnId());
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return ResponseDTO.ok();
 | 
					        return ResponseDTO.ok();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
| 
						 | 
					@ -99,10 +100,12 @@ public class AsnDetailService {
 | 
				
			||||||
        asnDetailDao.updateById(asnDetailEntity);
 | 
					        asnDetailDao.updateById(asnDetailEntity);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        ItemEntity item = itemDao.selectById(updateForm.getItemId());
 | 
					        ItemEntity item = itemDao.selectById(updateForm.getItemId());
 | 
				
			||||||
        dataTracerService.addTrace(asnDetailEntity.getAsnId(), DataTracerTypeEnum.ASN, "编辑:" + item.getItemCode() + "物料明细", originEntity, asnDetailEntity);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //刷新出库单
 | 
					        //刷新出库单
 | 
				
			||||||
        refreshAsn(updateForm.getAsnId());
 | 
					        refreshAsn(updateForm.getAsnId());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        dataTracerService.addTrace(asnDetailEntity.getAsnId(), DataTracerTypeEnum.ASN, "编辑:" + item.getItemCode() + "物料明细", originEntity, asnDetailEntity);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return ResponseDTO.ok();
 | 
					        return ResponseDTO.ok();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -139,7 +142,7 @@ public class AsnDetailService {
 | 
				
			||||||
            //批量删除
 | 
					            //批量删除
 | 
				
			||||||
            asnDetailManager.removeBatchByIds(toDeleteList);
 | 
					            asnDetailManager.removeBatchByIds(toDeleteList);
 | 
				
			||||||
            //操作记录
 | 
					            //操作记录
 | 
				
			||||||
            dataTracerService.addTrace(asnIds.get(0), DataTracerTypeEnum.ASN, "批量删除:" + joiner.getSussMsg().toString());
 | 
					            dataTracerService.addTrace(asnIds.get(0), DataTracerTypeEnum.ASN, "批量删除:" + joiner.getSussMsg().toString()+ joiner.getErrorMsg().toString());
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //刷新出库单
 | 
					        //刷新出库单
 | 
				
			||||||
| 
						 | 
					@ -171,12 +174,13 @@ public class AsnDetailService {
 | 
				
			||||||
        asnDetailDao.deleteById(asnDetailId);
 | 
					        asnDetailDao.deleteById(asnDetailId);
 | 
				
			||||||
        joiner.getSussMsg().add(item.getItemCode() + "删除成功");
 | 
					        joiner.getSussMsg().add(item.getItemCode() + "删除成功");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //操作记录
 | 
					 | 
				
			||||||
        dataTracerService.addTrace(asnId, DataTracerTypeEnum.ASN, "删除:" + joiner.getSussMsg().toString());
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        //刷新出库单
 | 
					        //刷新出库单
 | 
				
			||||||
        refreshAsn(asnId);
 | 
					        refreshAsn(asnId);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //操作记录
 | 
				
			||||||
 | 
					        dataTracerService.addTrace(asnId, DataTracerTypeEnum.ASN, "删除:" + joiner.getSussMsg().toString()+ joiner.getErrorMsg().toString());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return ResponseDTOUtils.buildResponseDTO(joiner);
 | 
					        return ResponseDTOUtils.buildResponseDTO(joiner);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue