仓库管理修改

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

@@ -287,6 +287,7 @@ public class StGlassCakeOutServiceImpl extends BaseServiceImpl<StGlassCakeOutMap
 				StStorehouse storehouse = stStorehouseService.getById(maxStock.getShId());
 				preOutStock.setShCode(storehouse.getShCode());
 				preOutStock.setRlsId(maxStock.getId());
+				preOutStock.setBatchCode(faYieldOrder.getBatchNo());
 				preOutStock.setStovePiNo(maxStock.getStovePiNo());
 
 				preOutStock.setThickness(maxStock.getThickness());

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

@@ -185,7 +185,7 @@ public class StGraphiteMoldOutServiceImpl extends BaseServiceImpl<StGraphiteMold
 				StStorehouse storehouse = stStorehouseService.getById(maxStock.getShId());
 				preOutStock.setShName(storehouse.getShName());
 				preOutStock.setRlsId(maxStock.getId());
-				preOutStock.setPiNo(maxStock.getPiNo());
+				preOutStock.setPiNo(faYieldOrder.getBatchNo());
 
 				preOutStock.setCurStatus(0L);
 				preOutStock.setCreateTime(now);

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

@@ -2,7 +2,6 @@ package org.springblade.wms.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -129,9 +128,7 @@ public class StOtherReceiptRecordServiceImpl extends BaseServiceImpl<StOtherRece
 				}
 			}
 
-			if (detail.getSirCode() == null) {
+			detail.setSirCode(stStockInoutRecordService.generateCode());
-				detail.setSirCode(stStockInoutRecordService.generateCode());
-			}
 			detail.setInOutSource(StStockInoutRecord.INOUT_SOURCE_OTHER_PURCHASE_RECEIPT);
 			// 赋值公共属性：批次号、入库单关联ID、部门/创建人
 			if (detail.getPiNo() == null) {

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

@@ -99,8 +99,8 @@ public class StStorageLocationServiceImpl extends BaseServiceImpl<StStorageLocat
 	public List<StStorageLocationVO> findByShIdAndGoodsId(Long shId, String goodsCode) {
 		// 1. 查询条件
 		QueryWrapper<StStorageLocation> wrapper = new QueryWrapper<>();
-		wrapper.eq("is_deleted", 0);
+		wrapper.eq("is_deleted", 0)
-//			.eq("goods_code", goodsCode);
+		       .eq("goods_code", goodsCode);
 		if (shId != null) {
 			wrapper.eq("sh_id", shId);
 		}