调整审批流问题

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditItemsServiceImpl.java

@@ -116,11 +116,11 @@ public class AuditItemsServiceImpl implements IAuditItemsService {
                         for (SysUser use : userList) {
                             if (Objects.equals(num, 1)) {
                                 auditItem.setAuditUserId(use.getUserId());
-                                int addAuditItem = auditItemsMapper.insertAuditItems(auditItem);
-                                if (addAuditItem <= 0) {
-                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                                    return AjaxResult.error("生成审批流明细失败，请联系管理员");
-                                }
+                            }
+                            int addAuditItem = auditItemsMapper.insertAuditItems(auditItem);
+                            if (addAuditItem <= 0) {
+                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                                return AjaxResult.error("生成审批流明细失败，请联系管理员");
                             }
                             AuditItemsUsers auditItemsUsers = createAuditItemsUsers(num, use.getUserId(), auditItem);
                             int addAuditUser = auditItemsUsersMapper.insertAuditItemsUsers(auditItemsUsers);

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditPathsServiceImpl.java

@@ -318,7 +318,7 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                         return AjaxResult.error("审批通过失败: 更新审批状态失败");
                     }
-                    if (auditItems.getActId() >= 110 && auditItems.getActId() <= 140) {
+                    if (auditItems.getActId() >= 110 && auditItems.getActId() <= 150) {
                         if ("T".equals(at.getIffinalItem())) {
                             fettle = 6L;
                         } else if ("F".equals(at.getIffinalItem())) {

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -592,6 +592,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             if ("SJRK".equals(billsType) || "SJCK".equals(billsType)) {
                 // 除了入库其他模块不需要更新主表的 仓储费计费日期到明细表，其他模块 应从库存总账把仓储费计费日期 赋给明细表
                 if ("SJRK".equals(billsType)) {
+                    wbItem.setfMblno(warehouseBills.getfMblno());
                     wbItem.setfBillingway(warehouseBills.getfBillingway());
                     wbItem.setfChargedate(warehouseBills.getfChargedate());
                     wbItem.setfOriginalbilldate(warehouseBills.getfBsdate());
@@ -621,7 +622,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             wbItem.setfPid(fPid);
             wbItem.setfBilltype(billsType);
             wbItem.setCreateTime(new Date());
-            wbItem.setfMblno(warehouseBills.getfMblno());
             wbItem.setfBillno(warehouseBills.getfBillno());
             wbItem.setCreateBy(loginUser.getUser().getUserName());
             tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem);