数据提交

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java

@@ -68,11 +68,11 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl<PlateGoodsApplyM
 			dataList.add(item);
 			if(approvalStatus.equals(PlateGoodsEnum.STATUS_PASS.getCode())){
 				//审批通过
-				mesApprovalRecordService.passApproval(id, MesApprovalRecordBizTypeEnum.PLATE_GOODS_RECORD.getDesc(),  AuthUtil.getUserId(), new Date());
+				mesApprovalRecordService.passApproval(id, MesApprovalRecordBizTypeEnum.PLATE_GOODS_APPLY.getDesc(),  AuthUtil.getUserId(), new Date());
 			}
 			if(approvalStatus.equals(PlateGoodsEnum.STATUS_NOT_PASS.getCode())){
 				//审批驳回
-				mesApprovalRecordService.rejectApproval(id, MesApprovalRecordBizTypeEnum.PLATE_GOODS_RECORD.getDesc(),  AuthUtil.getUserId(), new Date());
+				mesApprovalRecordService.rejectApproval(id, MesApprovalRecordBizTypeEnum.PLATE_GOODS_APPLY.getDesc(),  AuthUtil.getUserId(), new Date());
 			}
 		});
 
@@ -99,6 +99,14 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl<PlateGoodsApplyM
 
 			// 3. 更新数据库
 			this.updateById(plateGoodsApply);
+			if(approvalStatus.equals(PlateGoodsEnum.SECOND_STATUS_PASS.getCode())){
+				//审批通过
+				mesApprovalRecordService.passApproval(id, MesApprovalRecordBizTypeEnum.PLATE_GOODS_APPLY.getDesc(),  AuthUtil.getUserId(), new Date());
+			}
+			if(approvalStatus.equals(PlateGoodsEnum.SECOND_STATUS_NOT_PASS.getCode())){
+				//审批驳回
+				mesApprovalRecordService.rejectApproval(id, MesApprovalRecordBizTypeEnum.PLATE_GOODS_APPLY.getDesc(),  AuthUtil.getUserId(), new Date());
+			}
 		}
 		return true;
 	}

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -382,9 +382,11 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
                     yieldOrder.getValidationResult().equals(YieldOrderEnum.VALIDATION_RESULT_PASS.getCode()) &&
                     yieldOrder.getReceiveStatus().equals(YieldOrderEnum.RECEIVE_STATUS_YES.getCode())) {
                 //订单状态为验证完成并且已接收 进行分派
-                boolean result = this.verifyYieldOrderResource(yieldOrder);
+                try {
-                if (!result) {
+                    this.yieldOrderAutoDispatch(yieldOrder);
-                    throw new ServiceException("分派异常请及时处理");
+                } catch (Exception e) {
+                    log.error("分派异常：{}",yieldOrder.getId());
+                    e.printStackTrace();
                 }
             }
         }