Merge remote-tracking branch 'origin/master'

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

@@ -11,7 +11,6 @@ import org.springblade.wms.pojo.vo.StGoodStatisVO;
 import org.springblade.wms.pojo.vo.StRealtimeStockVO;
 import org.springblade.wms.pojo.vo.StStorehouseVO;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -101,7 +100,7 @@ public interface StRealtimeStockMapper extends BaseMapper<StRealtimeStock> {
 
 	void insertStockLock(StRealtimeStockLock lock);
 
-	List<StRealtimeStock> selectMaxUsableStockByCakeAttr(String isPrint, BigDecimal powderWeight, String materialNo, BigDecimal thickness, String goodsCode);
+	List<StRealtimeStock> selectMaxUsableStockByCakeAttr(String isPrint, String powderWeight, String materialNo, String thickness, String goodsCode);
 
 	List<StStorehouseVO> findStorehouseByGoodsCode(String goodsCode);
 

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

@@ -614,28 +614,28 @@
         -- 调整：goods_code从关联的STGOODS表匹配，而非库存表
         WHERE g.goods_code = #{goodsCode}
         AND s.stop_use = 0
-        <if test="materialNo == null">
+        <if test="materialNo == null or materialNo == ''">
             AND s.material_no IS NULL
         </if>
         <if test="materialNo != null">
             AND s.material_no = #{materialNo}
         </if>
 
-        <if test="powderWeight == null">
+        <if test="powderWeight == null or powderWeight == ''">
             AND s.powder_weight IS NULL
         </if>
         <if test="powderWeight != null">
             AND s.powder_weight = #{powderWeight}
         </if>
 
-        <if test="thickness == null">
+        <if test="thickness == null or thickness == ''">
             AND s.thickness IS NULL
         </if>
         <if test="thickness != null">
             AND s.thickness = #{thickness}
         </if>
 
-        <if test="isPrint == null">
+        <if test="isPrint == null or isPrint == ''">
             AND s.print_mark IS NULL
         </if>
         <if test="isPrint != null">

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

@@ -25,7 +25,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -163,9 +162,13 @@ public class StGlassCakeOutServiceImpl extends BaseServiceImpl<StGlassCakeOutMap
 			for (DsPartEntity glassCake : glassCakePartList) {
 				// 玻璃饼核心属性（用于匹配库存，空值则跳过该玻璃饼）
 				String isPrint = glassCake.getIsPrint(); // 是否印字
-				BigDecimal powderWeight = glassCake.getPowderWeight(); // 粉重
+				String powderWeight = glassCake.getPowderWeight() == null
+						? null
+						: String.valueOf(glassCake.getPowderWeight());
 				String materialNo = glassCake.getMaterial(); // 材料号
-				BigDecimal thickness = glassCake.getFormingThickness(); // 成型厚度
+				String thickness = glassCake.getFormingThickness() == null
+						? null
+						: String.valueOf(glassCake.getFormingThickness());
 				String goodsCode = glassCake.getPartCode();
 
 				DsPartRelationEntity dsPartRelation = baseMapper.getPartQuota(faYieldOrder.getPartCode(), goodsCode);

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

@@ -331,9 +331,13 @@ public class StOtherReceiptRecordServiceImpl extends BaseServiceImpl<StOtherRece
 		if ("1".equals(partOne.getIsGlassCake())) {
 			if (goodsCode.equals(partOne.getPartCode())) {
 				inoutRecord.setPrintMark(partOne.getIsPrint());
-				inoutRecord.setPowderWeight(String.valueOf(partOne.getPowderWeight()));
+				inoutRecord.setPowderWeight(
+						partOne.getPowderWeight() == null ? null : String.valueOf(partOne.getPowderWeight())
+				);
 				inoutRecord.setMaterialNo(partOne.getMaterial());
-				inoutRecord.setThickness(String.valueOf(partOne.getFormingThickness()));
+				inoutRecord.setThickness(
+						partOne.getFormingThickness() == null ? null : String.valueOf(partOne.getFormingThickness())
+				);
 			}
 		}