修改审批 sql 报错语句

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/approvalFlow/AuditPathsController.java

@@ -111,7 +111,6 @@ public class AuditPathsController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('warehouse:paths:query')")
     @PostMapping(value = "/projectEndQueryPendingVal")
-    @RepeatSubmit
     public AjaxResult projectEndQueryPendingVal(@RequestBody AuditItems auditItems) {
         if (StringUtils.isNull(auditItems) || StringUtils.isNull(auditItems.getId()) || StringUtils.isNull(auditItems.getActId())) {
             return AjaxResult.error("找不到查询条件，请确认");
@@ -124,7 +123,6 @@ public class AuditPathsController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('warehouse:paths:query')")
     @PostMapping(value = "/selectAllAuditItems")
-    @RepeatSubmit
     public AjaxResult selectAllAuditItems(@RequestBody AuditItems auditItems) {
         /*if (StringUtils.isNull(auditItems)) {
             return AjaxResult.error("找不到查询条件，请确认");

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

@@ -9,6 +9,7 @@ import com.ruoyi.approvalFlow.service.impl.AuditItemsServiceImpl;
 import com.ruoyi.basicData.domain.*;
 import com.ruoyi.basicData.mapper.*;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
@@ -132,7 +133,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 corpsId.add(tWarehousebills.getfTocorpid());
             }
             corpsId.add(tWarehousebills.getfCorpid());
-            // 查询联系人
+            // 查询制单人
+            SysUser logUser = sysUserMapper.selectUserByUserName(tWarehousebills.getCreateBy());
+            if (StringUtils.isNotNull(logUser)) {
+                SysDept sysDept = sysDeptMapper.selectDeptById(logUser.getDeptId());
+                sysUserList.add(logUser);
+                map.put("dept", sysDept);
+            }
             SysUser sysUser = sysUserMapper.selectUserByUserName(tWarehousebills.getfStorekeeper());
             if (StringUtils.isNotNull(sysUser)) {
                 sysUserList.add(sysUser);
@@ -642,11 +649,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             auditItems.setIffinalItem("F");
             auditItems.setBillNo(warehouseBills.getfBillno());
             // 存储委托方（货权方）
-            auditItems.setRefno1(warehouseBills.getfBillno());
+            auditItems.setRefno1(warehouseBills.getfCorpid() + "");
             // 存储业务类型（业务类型）
             auditItems.setRefno2(warehouseBills.getfBilltype());
             // 存储提单号（提单号）
-            auditItems.setRefno3(warehouseBills.getfBilltype());
+            auditItems.setRefno3(warehouseBills.getfMblno());
             auditItems.setSendUserId(loginUser.getUser().getUserId());
             auditItems.setSendName(loginUser.getUsername());
             auditItems.setSendTime(new Date());
@@ -971,25 +978,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 serialNumber = billnoSerialServiceImpl.getSerialNumber("CK", time);
                 item.setfSerialNumber(serialNumber);
             }
-            int num = 0;
-            if (StringUtils.isNotNull(item.getfId())) {
-                item.setfBillstatus(status);
-                item.setUpdateTime(new Date());
-                item.setUpdateBy(loginUser.getUser().getUserName());
-                num = tWarehousebillsitemsMapper.updateTWarehousebillsitems(item);
-                // 添加状态log
-                insertTWarehousebillsLog(item, status, loginUser);
-            } else {
-                item.setfPid(tWarehouseBills.getfId());
-                item.setfBillno(tWarehouseBills.getfBillno());
-                item.setfBillstatus(status);
-                item.setCreateTime(new Date());
-                item.setCreateBy(loginUser.getUser().getUserName());
-                num = tWarehousebillsitemsMapper.insertTWarehousebillsitems(item);
-                // 添加状态log
-                insertTWarehousebillsLog(item, 10L, loginUser);
-                insertTWarehousebillsLog(item, status, loginUser);
-            }
+            item.setfBillstatus(status);
+            item.setUpdateTime(new Date());
+            item.setUpdateBy(loginUser.getUser().getUserName());
+            int num = tWarehousebillsitemsMapper.updateTWarehousebillsitems(item);
+            // 添加状态log
+            insertTWarehousebillsLog(item, status, loginUser);
             if (num <= 0) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error("更新库存明细失败");

ruoyi-warehouse/src/main/resources/mapper/approvalFlow/AuditItemsMapper.xml

@@ -144,17 +144,19 @@
             item.id,
             item.act_id AS actId,
             item.bill_id AS billId,
+            item.audit_item AS auditItem,
             corp.f_name AS refno1,
             item.refno2,
             item.refno3,
             usr.user_name AS auditUserName,
+            usr.nick_name AS nickName,
             item.audit_item AS auditItem,
             item.audit_msg AS auditMsg,
             item.audit_status AS auditStatus
         FROM
             audit_items item
-            LEFT JOIN audit_items_users us ON us.pid = item.id
             LEFT JOIN t_corps corp ON corp.f_id = item.refno1
+            LEFT JOIN audit_items_users us ON us.pid = item.id
             LEFT JOIN sys_user usr ON usr.user_id = item.audit_user_id
         where
             us.audit_status = 'S'