仓库管理修改

blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StStockInoutRecord.java

@@ -185,6 +185,11 @@ public class StStockInoutRecord extends TenantEntity {
 	 */
 	@Schema(description = "流程卡号")
 	private String cardNo;
+	/**
+	 * 领料人班组ID
+	 */
+	@Schema(description = "领料人班组ID")
+	private String pickerTeamSet;
 
 	/**
 	 * 是否印字

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

@@ -135,6 +135,7 @@ public class StComboxController {
 				.or()
 				.like("goods_name", filterValue));
 		}
+		qw.orderByDesc("create_time");
 		// 2. 数据权限：当前用户工厂（可选）
 		/*BladeUser user = AuthUtil.getUser();
 		if (user != null && user.getDeptId() != null) {

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

@@ -45,5 +45,7 @@ public interface StStockInoutRecordMapper extends BaseMapper<StStockInoutRecord>
 	String getMaxCheckCode(@Param("datePrefix") String datePrefix);
 
     String getMaxPiNo(String format);
+
+	String getTeamSetByUserId(Long picker);
 }
 

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

@@ -158,6 +158,18 @@
         WHERE ROWNUM = 1
     </select>
 
+    <select id="getTeamSetByUserId" resultType="java.lang.String">
+        SELECT
+            LISTAGG(TEAM_SET_ID, ',') WITHIN GROUP (ORDER BY TEAM_SET_ID) AS team_ids
+        FROM
+            BS_REL_TEAM_SET_USER
+        WHERE
+            USER_ID = #{picker}        -- 传入用户ID
+          AND IS_DELETED = 0        -- 未删除
+        GROUP BY
+            USER_ID
+    </select>
+
     <select id="exportStStockInoutRecord" resultType="org.springblade.wms.excel.StStockInoutRecordExcel">
         SELECT * FROM ST_STOCK_INOUT_RECORD ${ew.customSqlSegment}
     </select>

blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStockInoutRecordService.java

@@ -47,5 +47,7 @@ public interface IStStockInoutRecordService extends BaseService<StStockInoutReco
     String getMaxPiNo(String typeCode);
 
 	StStockInoutRecord createInoutRecord(Short inOutSource, Long shId, BladeUser createUser, BladeUser userId, Double arriveQuantity, Double unitPrice, String piNo, StGoods stGoods, Long brId, Long slId, String checkNo, String quantityLevel, String buyCode, boolean moldBaseMaterial);
+
+	String getTeamSetByUserId(Long picker);
 }
 

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

@@ -354,6 +354,8 @@ public class StClassRequestServiceImpl extends BaseServiceImpl<StClassRequestMap
 		record.setUserId(picker);
 		record.setDeptId(user.getDeptId());
 		record.setCreateUser(user.getUserId());
+		String pickerTeamSet = stStockInoutRecordService.getTeamSetByUserId(picker);
+		record.setPickerTeamSet(pickerTeamSet);
 
 		/* 原明细字段 */
 		record.setGoodsId(stock.getGoodsId());

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

@@ -553,6 +553,8 @@ public class StGlassCakeOutServiceImpl extends BaseServiceImpl<StGlassCakeOutMap
 			inoutRecord.setUserId(userId);
 			// 租户/创建人基础字段（继承TenantEntity）
 			inoutRecord.setUserId(param.getPicker());
+			String pickerTeamSet = stStockInoutRecordService.getTeamSetByUserId(param.getPicker());
+			inoutRecord.setPickerTeamSet(pickerTeamSet);
 			inoutRecord.setCreateUser(userId);
 			inoutRecord.setCreateTime(nowDate);
 			inoutRecord.setUpdateUser(userId);

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
@@ -32,6 +33,7 @@ import java.util.*;
  **/
 
 @Service
+@Slf4j
 public class StGraphiteMoldOutServiceImpl extends BaseServiceImpl<StGraphiteMoldOutMapper, StGraphiteMoldOut> implements IStGraphiteMoldOutService {
 	@Resource
 	StRealtimeStockMapper stRealtimeStockMapper;
@@ -75,7 +77,8 @@ public class StGraphiteMoldOutServiceImpl extends BaseServiceImpl<StGraphiteMold
 		List<StRealtimeStock> allUsableStockList = stRealtimeStockMapper.selectMaxUsableStockByMoldAttr(goodsCode);
 
 		if (allUsableStockList == null || allUsableStockList.isEmpty()) {
-			throw new ServiceException("石墨模【" + goodsCode + "】库存不足，无法生成！需求数量：" + requireQty);
+			log.info("石墨模【{}】库存不足，无法生成！需求数量：{}", goodsCode, requireQty);
+			return Collections.emptyList();
 		}
 		for (StRealtimeStock stock : allUsableStockList) {
 			double occupy = Optional.ofNullable(stock.getOccupyQuantity()).orElse(0D);
@@ -96,7 +99,8 @@ public class StGraphiteMoldOutServiceImpl extends BaseServiceImpl<StGraphiteMold
 //			throw new ServiceException("石墨模【" + goodsCode + "】库存不足，无法生成！需求数量：" + requireQty + "，可用库存：" + totalUsable);
 //		}
 		if (candidateStockList.isEmpty()) {
-			throw new ServiceException("石墨模【" + goodsCode + "】库存不足，无法生成！需求数量：" + requireQty);
+			log.info("石墨模【{}】库存不足，无法生成！需求数量：{}", goodsCode, requireQty);
+			return Collections.emptyList();
 		}
 
 		double remainingQty = requireQty;
@@ -318,6 +322,8 @@ public class StGraphiteMoldOutServiceImpl extends BaseServiceImpl<StGraphiteMold
 			inoutRecord.setInOutDate(nowDate);
 
 			inoutRecord.setUserId(param.getPicker());
+			String pickerTeamSet = stStockInoutRecordService.getTeamSetByUserId(param.getPicker());
+			inoutRecord.setPickerTeamSet(pickerTeamSet);
 			inoutRecord.setCreateUser(userId);
 			inoutRecord.setCreateTime(nowDate);
 			inoutRecord.setUpdateUser(userId);

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

@@ -269,6 +269,9 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
 				detail.setShId(mainInout.getShId());
 				detail.setDeptId(mainInout.getDeptId());
 				detail.setCreateUser(mainInout.getCreateUser());
+				detail.setUserId(stOtherOutRecord.getPicker());
+				String pickerTeamSet = stStockInoutRecordService.getTeamSetByUserId(stOtherOutRecord.getPicker());
+				detail.setPickerTeamSet(pickerTeamSet);
 				// 明细独有属性
 				detail.setGoodsId(entity.getGoodsId());
 				detail.setQuantity(stock.getOutQuantity());

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

@@ -144,6 +144,11 @@ public class StStockInoutRecordServiceImpl extends BaseServiceImpl<StStockInoutR
 		return record;
 	}
 
+	@Override
+	public String getTeamSetByUserId(Long picker) {
+		return baseMapper.getTeamSetByUserId(picker);
+	}
+
 	@Override
 	public List<StStockInoutRecordExcel> exportStStockInoutRecord(Wrapper<StStockInoutRecord> queryWrapper) {
 		List<StStockInoutRecordExcel> stStockInoutRecordList = baseMapper.exportStStockInoutRecord(queryWrapper);