日志保存

performance-web/src/main/java/com/clx/performance/service/OrderChildPoundLogService.java

@@ -14,6 +14,6 @@ public interface OrderChildPoundLogService {
 
     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

@@ -77,6 +77,7 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_STATUS_CHANGED);
         }
 
+        //磅单审核对象赋值
         poundAuditDetail.setStatus(param.getStatus());
         poundAuditDetail.setRejectType(param.getRejectType());
         poundAuditDetail.setRemark(param.getRemark());
@@ -84,41 +85,34 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
 
         Integer type = OrderChildLogEnum.Type.POUND_AUDIT.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();
         }else{
             if(Objects.nonNull(param.getLoadNet())){
                 poundAuditDetail.setLoadNet(param.getLoadNet());
-            }else{
-                poundAuditDetail.setLoadNet(orderChild.getLoadNet());
+                orderChild.setLoadNet(param.getLoadNet());
             }
 
             if(Objects.nonNull(param.getUnloadNet())){
                 poundAuditDetail.setUnloadNet(param.getUnloadNet());
-            }else{
-                poundAuditDetail.setUnloadNet(orderChild.getUnloadNet());
+                orderChild.setUnloadNet(param.getUnloadNet());
             }
         }
 
-
+        //保存磅单审核数据
         orderChildPoundAuditDao.saveEntity(poundAuditDetail);
 
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         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();
 
+        //保存磅单审核日志数据
         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());
         orderChildDao.updatePoundAuditStatus(orderChild);
 
+        //保存运单日志数据
         orderChildLogService.saveOrderChildLog(param.getChildNo(),type,OrderChildLogEnum.Type.getByCode(type).get().getMsg(),
                 OrderChildLogEnum.CreateType.PLATFORM.getCode(), loginUserInfo.getUserNo(),loginUserInfo.getUserName());
 

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildPoundLogServiceImpl.java

@@ -33,13 +33,14 @@ public class OrderChildPoundLogServiceImpl  implements OrderChildPoundLogService
     }
 
     @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();
         poundLog.setChildNo(childNo);
         poundLog.setStatus(status);
         poundLog.setRemark(remark);
         poundLog.setCreateBy(createBy);
         poundLog.setCreateName(createName);
+        poundLog.setCreateType(createType);
 
         orderChildPoundLogDao.saveEntity(poundLog);
 

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -468,15 +468,15 @@ public class OrderChildServiceImpl implements OrderChildService {
             // 日志
             orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.UNLOAD.getCode(), OrderChildLogEnum.Type.UNLOAD.getMsg(),
                     loginUserInfo.getUserNo(), loginUserInfo.getUserName());
-            orderChildPoundLogService.saveDriverOrderChildLog(childNo, OrderChildPoundAuditEnum.Status.AUDIT.getCode(), "",
-                    loginUserInfo.getUserNo(), loginUserInfo.getUserName());
+            orderChildPoundLogService.saveDriverOrderChildLog(childNo, OrderChildPoundAuditEnum.Status.AUDIT.getCode(), OrderChildPoundAuditEnum.Status.AUDIT.getMsg(),
+                    OrderChildLogEnum.CreateType.DRIVER.getCode(),loginUserInfo.getUserNo(), loginUserInfo.getUserName());
         } else {
             updateReUnload(param, orderChild);
             // 日志
             orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.REUNLOAD.getCode(), OrderChildLogEnum.Type.REUNLOAD.getMsg(),
                     loginUserInfo.getUserNo(), loginUserInfo.getUserName());
-            orderChildPoundLogService.saveDriverOrderChildLog(childNo, OrderChildPoundAuditEnum.Status.AUDIT.getCode(), "",
-                    loginUserInfo.getUserNo(), loginUserInfo.getUserName());
+            orderChildPoundLogService.saveDriverOrderChildLog(childNo, OrderChildPoundAuditEnum.Status.AUDIT.getCode(), OrderChildPoundAuditEnum.Status.AUDIT.getMsg(),
+                    OrderChildLogEnum.CreateType.DRIVER.getCode(),loginUserInfo.getUserNo(), loginUserInfo.getUserName());
         }
     }
 
@@ -653,8 +653,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.RELOAD_AND_REUNLOAD.getCode(), OrderChildLogEnum.Type.RELOAD_AND_REUNLOAD.getMsg(),
                 loginUserInfo.getUserNo(), loginUserInfo.getUserName());
 
-        orderChildPoundLogService.saveDriverOrderChildLog(childNo, OrderChildPoundAuditEnum.Status.AUDIT.getCode(), "",
-                loginUserInfo.getUserNo(), loginUserInfo.getUserName());
+        orderChildPoundLogService.saveDriverOrderChildLog(childNo, OrderChildPoundAuditEnum.Status.AUDIT.getCode(), OrderChildPoundAuditEnum.Status.AUDIT.getMsg(),
+                OrderChildLogEnum.CreateType.DRIVER.getCode(),loginUserInfo.getUserNo(), loginUserInfo.getUserName());
     }
 
     @Override