Skip to content

C
clx-performance
提交 181da7e0 authored 作者: liruixin's avatar liruixin
浏览文件
操作

日志保存

上级 6bbfe5de
显示空白字符变更
内嵌 并排
正在显示 包含 16 行增加 和 21 行删除
performance-web/src/main/java/com/clx/performance/service/OrderChildPoundLogService.java
浏览文件 @ 181da7e0
...@@ -14,6 +14,6 @@ public interface OrderChildPoundLogService { ...@@ -14,6 +14,6 @@ public interface OrderChildPoundLogService {
List<OrderChildPoundLogVO> getPoundLogList(String childNo); List<OrderChildPoundLogVO> getPoundLogList(String childNo);
void saveDriverOrderChildLog(String childNo, Integer status, String remark, Long createBy, String createName); void saveDriverOrderChildLog(String childNo, Integer status, String remark,Integer createType, Long createBy, String createName);
} }
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildPoundAuditServiceImpl.java
浏览文件 @ 181da7e0
...@@ -77,6 +77,7 @@ public class OrderChildPoundAuditServiceImpl implements OrderChildPoundAuditSer ...@@ -77,6 +77,7 @@ public class OrderChildPoundAuditServiceImpl implements OrderChildPoundAuditSer
throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_STATUS_CHANGED); throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_STATUS_CHANGED);
} }
//磅单审核对象赋值
poundAuditDetail.setStatus(param.getStatus()); poundAuditDetail.setStatus(param.getStatus());
poundAuditDetail.setRejectType(param.getRejectType()); poundAuditDetail.setRejectType(param.getRejectType());
poundAuditDetail.setRemark(param.getRemark()); poundAuditDetail.setRemark(param.getRemark());
...@@ -84,41 +85,34 @@ public class OrderChildPoundAuditServiceImpl implements OrderChildPoundAuditSer ...@@ -84,41 +85,34 @@ public class OrderChildPoundAuditServiceImpl implements OrderChildPoundAuditSer
Integer type = OrderChildLogEnum.Type.POUND_AUDIT.getCode(); Integer type = OrderChildLogEnum.Type.POUND_AUDIT.getCode();
if(Objects.equals(param.getStatus(), OrderChildPoundAuditEnum.Status.REJECT.getCode())){ if(Objects.equals(param.getStatus(), OrderChildPoundAuditEnum.Status.REJECT.getCode())){
poundAuditDetail.setLoadNet(orderChild.getLoadNet());
poundAuditDetail.setUnloadNet(orderChild.getUnloadNet());
type = OrderChildLogEnum.Type.POUND_AUDIT_REJECT.getCode(); type = OrderChildLogEnum.Type.POUND_AUDIT_REJECT.getCode();
}else{ }else{
if(Objects.nonNull(param.getLoadNet())){ if(Objects.nonNull(param.getLoadNet())){
poundAuditDetail.setLoadNet(param.getLoadNet()); poundAuditDetail.setLoadNet(param.getLoadNet());
}else{ orderChild.setLoadNet(param.getLoadNet());
poundAuditDetail.setLoadNet(orderChild.getLoadNet());
} }
if(Objects.nonNull(param.getUnloadNet())){ if(Objects.nonNull(param.getUnloadNet())){
poundAuditDetail.setUnloadNet(param.getUnloadNet()); poundAuditDetail.setUnloadNet(param.getUnloadNet());
}else{ orderChild.setUnloadNet(param.getUnloadNet());
poundAuditDetail.setUnloadNet(orderChild.getUnloadNet());
} }
} }
//保存磅单审核数据
orderChildPoundAuditDao.saveEntity(poundAuditDetail); orderChildPoundAuditDao.saveEntity(poundAuditDetail);
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
OrderChildPoundLog poundLog = OrderChildPoundLog.builder().childNo(param.getChildNo()).status(param.getStatus()).createType(OrderChildLogEnum.CreateType.PLATFORM.getCode()) OrderChildPoundLog poundLog = OrderChildPoundLog.builder().childNo(param.getChildNo()).status(param.getStatus()).createType(OrderChildLogEnum.CreateType.PLATFORM.getCode())
.remark(OrderChildPoundAuditEnum.Status.getByCode(param.getStatus()).get().getMsg()).createBy(loginUserInfo.getUserNo()).createName(loginUserInfo.getUserName()).build(); .remark(OrderChildPoundAuditEnum.Status.getByCode(param.getStatus()).get().getMsg()).createBy(loginUserInfo.getUserNo()).createName(loginUserInfo.getUserName()).build();
//保存磅单审核日志数据
orderChildPoundLogDao.saveEntity(poundLog); orderChildPoundLogDao.saveEntity(poundLog);
if(Objects.nonNull(param.getLoadNet())){ //更新运单数据
orderChild.setLoadNet(param.getLoadNet());
}
if(Objects.nonNull(param.getUnloadNet())){
orderChild.setUnloadNet(param.getUnloadNet());
}
orderChild.setPoundStatus(param.getStatus()); orderChild.setPoundStatus(param.getStatus());
orderChildDao.updatePoundAuditStatus(orderChild); orderChildDao.updatePoundAuditStatus(orderChild);
//保存运单日志数据
orderChildLogService.saveOrderChildLog(param.getChildNo(),type,OrderChildLogEnum.Type.getByCode(type).get().getMsg(), orderChildLogService.saveOrderChildLog(param.getChildNo(),type,OrderChildLogEnum.Type.getByCode(type).get().getMsg(),
OrderChildLogEnum.CreateType.PLATFORM.getCode(), loginUserInfo.getUserNo(),loginUserInfo.getUserName()); OrderChildLogEnum.CreateType.PLATFORM.getCode(), loginUserInfo.getUserNo(),loginUserInfo.getUserName());
......
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildPoundLogServiceImpl.java
浏览文件 @ 181da7e0
...@@ -33,13 +33,14 @@ public class OrderChildPoundLogServiceImpl implements OrderChildPoundLogService ...@@ -33,13 +33,14 @@ public class OrderChildPoundLogServiceImpl implements OrderChildPoundLogService
} }
@Override @Override
public void saveDriverOrderChildLog(String childNo, Integer status, String remark, Long createBy, String createName) { public void saveDriverOrderChildLog(String childNo, Integer status, String remark,Integer createType, Long createBy, String createName) {
OrderChildPoundLog poundLog = new OrderChildPoundLog(); OrderChildPoundLog poundLog = new OrderChildPoundLog();
poundLog.setChildNo(childNo); poundLog.setChildNo(childNo);
poundLog.setStatus(status); poundLog.setStatus(status);
poundLog.setRemark(remark); poundLog.setRemark(remark);
poundLog.setCreateBy(createBy); poundLog.setCreateBy(createBy);
poundLog.setCreateName(createName); poundLog.setCreateName(createName);
poundLog.setCreateType(createType);
orderChildPoundLogDao.saveEntity(poundLog); orderChildPoundLogDao.saveEntity(poundLog);
......
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
浏览文件 @ 181da7e0
...@@ -468,15 +468,15 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -468,15 +468,15 @@ public class OrderChildServiceImpl implements OrderChildService {
// 日志 // 日志
orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.UNLOAD.getCode(), OrderChildLogEnum.Type.UNLOAD.getMsg(), orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.UNLOAD.getCode(), OrderChildLogEnum.Type.UNLOAD.getMsg(),
loginUserInfo.getUserNo(), loginUserInfo.getUserName()); loginUserInfo.getUserNo(), loginUserInfo.getUserName());
orderChildPoundLogService.saveDriverOrderChildLog(childNo, OrderChildPoundAuditEnum.Status.AUDIT.getCode(), "", orderChildPoundLogService.saveDriverOrderChildLog(childNo, OrderChildPoundAuditEnum.Status.AUDIT.getCode(), OrderChildPoundAuditEnum.Status.AUDIT.getMsg(),
loginUserInfo.getUserNo(), loginUserInfo.getUserName()); OrderChildLogEnum.CreateType.DRIVER.getCode(),loginUserInfo.getUserNo(), loginUserInfo.getUserName());
} else { } else {
updateReUnload(param, orderChild); updateReUnload(param, orderChild);
// 日志 // 日志
orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.REUNLOAD.getCode(), OrderChildLogEnum.Type.REUNLOAD.getMsg(), orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.REUNLOAD.getCode(), OrderChildLogEnum.Type.REUNLOAD.getMsg(),
loginUserInfo.getUserNo(), loginUserInfo.getUserName()); loginUserInfo.getUserNo(), loginUserInfo.getUserName());
orderChildPoundLogService.saveDriverOrderChildLog(childNo, OrderChildPoundAuditEnum.Status.AUDIT.getCode(), "", orderChildPoundLogService.saveDriverOrderChildLog(childNo, OrderChildPoundAuditEnum.Status.AUDIT.getCode(), OrderChildPoundAuditEnum.Status.AUDIT.getMsg(),
loginUserInfo.getUserNo(), loginUserInfo.getUserName()); OrderChildLogEnum.CreateType.DRIVER.getCode(),loginUserInfo.getUserNo(), loginUserInfo.getUserName());
} }
} }
...@@ -653,8 +653,8 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -653,8 +653,8 @@ public class OrderChildServiceImpl implements OrderChildService {
orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.RELOAD_AND_REUNLOAD.getCode(), OrderChildLogEnum.Type.RELOAD_AND_REUNLOAD.getMsg(), orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.RELOAD_AND_REUNLOAD.getCode(), OrderChildLogEnum.Type.RELOAD_AND_REUNLOAD.getMsg(),
loginUserInfo.getUserNo(), loginUserInfo.getUserName()); loginUserInfo.getUserNo(), loginUserInfo.getUserName());
orderChildPoundLogService.saveDriverOrderChildLog(childNo, OrderChildPoundAuditEnum.Status.AUDIT.getCode(), "", orderChildPoundLogService.saveDriverOrderChildLog(childNo, OrderChildPoundAuditEnum.Status.AUDIT.getCode(), OrderChildPoundAuditEnum.Status.AUDIT.getMsg(),
loginUserInfo.getUserNo(), loginUserInfo.getUserName()); OrderChildLogEnum.CreateType.DRIVER.getCode(),loginUserInfo.getUserNo(), loginUserInfo.getUserName());
} }
@Override @Override
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论