仓库管理修改

blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java

@@ -1,6 +1,5 @@
 package org.springblade.wms.controller;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -119,12 +118,12 @@ public class StOtherOutRecordController extends BladeController {
 			stOtherOutRecord.setCreateDept(Long.valueOf(user.getDeptId()));
 		}
 
-		String userRoleName = user.getRoleName();
-		stOtherOutRecord.setUserRoleName(userRoleName);
-		if (StrUtil.isNotBlank(userRoleName) && userRoleName.contains("rb_craft")) {
-			// 工艺员：可查询审批状态为「审批中」的数据
-			stOtherOutRecord.setApprovalStatus(StOtherOutRecord.APPROVAL_STATUS_CHECKING);
-		}
+//		String userRoleName = user.getRoleName();
+//		stOtherOutRecord.setUserRoleName(userRoleName);
+//		if (StrUtil.isNotBlank(userRoleName) && userRoleName.contains("rb_craft")) {
+//			// 工艺员：可查询审批状态为「审批中」的数据
+//			stOtherOutRecord.setApprovalStatus(StOtherOutRecord.APPROVAL_STATUS_CHECKING);
+//		}
 
 		IPage<StOtherOutRecordVO> pages = stOtherOutRecordService.selectStOtherOutRecordPage(Condition.getPage(query), stOtherOutRecord);
 

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StMoldApplyForMapper.xml

@@ -48,6 +48,7 @@
         LEFT JOIN BLADE_USER cu ON maf.create_user = cu.id AND cu.is_deleted = 0
         -- 原有基础条件：软删除
         WHERE maf.is_deleted = 0
+        AND maf.approval_status != 1
         <!-- 原有动态条件：mafType（接口固定设为MAF_STATUS_HAVE=2） -->
         <if test="stMoldApplyFor.mafType != null">
             AND maf.MAF_TYPE = #{stMoldApplyFor.mafType}

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml

@@ -72,10 +72,6 @@
                 AND soor.cr_code LIKE '%' || #{stOtherOutRecord.crCode} || '%'
             </if>
 
-            <if test="stOtherOutRecord.userRoleName != null and stOtherOutRecord.userRoleName.contains('rb_craft')">
-                AND soor.approval_status = 0
-            </if>
-
             <!-- 2. 出库日期范围查询 -->
             <if test="stOtherOutRecord.startInOutDate != null">
                 AND sir.in_out_date &gt;= TO_DATE(#{stOtherOutRecord.startInOutDate}, 'yyyy-mm-dd')

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java

@@ -266,7 +266,6 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
 				if(stOtherOutRecord.getShId() == null) {
 					detail.setShId(entity.getShId());
 				}
-				detail.setShId(mainInout.getShId());
 				detail.setDeptId(mainInout.getDeptId());
 				detail.setCreateUser(mainInout.getCreateUser());
 				detail.setUserId(stOtherOutRecord.getPicker());