Merge remote-tracking branch 'origin/v4.9_create_goods_child_20230918' into…

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -122,7 +122,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     public boolean updatePoundAuditStatus(OrderChild item) {
         return update(lUdWrapper()
                 .eq(OrderChild::getChildNo, item.getChildNo())
-                .set(OrderChild::getStatus, item.getStatus())
                 .set(OrderChild::getPoundStatus, item.getPoundStatus())
                 .set(OrderChild::getLoadNet, item.getLoadNet())
                 .set(OrderChild::getUnloadNet, item.getUnloadNet())

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

@@ -68,16 +68,14 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
     @Transactional(rollbackFor = Exception.class)
     public void updatePoundAudit(PoundAuditParam param) {
 
-        //OrderChild orderChild = orderChildDao.getByChildNo(param.getChildNo()).orElseThrow(ResultCodeEnum.FAIL);
+        OrderChild orderChild = orderChildDao.getByChildNo(param.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
         OrderChildPoundAudit poundAuditDetail = orderChildPoundAuditDao.getPoundAuditDetail(param.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         poundAuditDetail.setStatus(param.getStatus());
-        //orderChild.setStatus(OrderChildEnum.Status.UNSETTLED.getCode());
         if(Objects.equals(param.getStatus(),OrderChildPoundAudit.AuditStatus.FAIL.getCode())){
             poundAuditDetail.setStatus(param.getStatus());
             poundAuditDetail.setRejectType(param.getRejectType());
             poundAuditDetail.setRemark(param.getRemark());
-            //orderChild.setStatus(OrderChildEnum.Status.POUND_AUDIT_FAIL.getCode());
         }
         if(Objects.nonNull(param.getLoadNet())){
             poundAuditDetail.setLoadNet(param.getLoadNet());
@@ -94,13 +92,13 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         orderChildPoundLogDao.saveEntity(poundLog);
 
         if(Objects.nonNull(param.getLoadNet())){
-            //orderChild.setLoadNet(param.getLoadNet());
+            orderChild.setLoadNet(param.getLoadNet());
         }
         if(Objects.nonNull(param.getUnloadNet())){
-            //orderChild.setUnloadNet(param.getUnloadNet());
+            orderChild.setUnloadNet(param.getUnloadNet());
         }
-        //orderChild.setPoundStatus(param.getStatus());
-        //orderChildDao.updatePoundAuditStatus(orderChild);
+        orderChild.setPoundStatus(param.getStatus());
+        orderChildDao.updatePoundAuditStatus(orderChild);
 
     }
 }