feat: 商品进销存

mec-biz/src/main/java/com/ym/mec/biz/service/impl/GoodsServiceImpl.java

@@ -487,6 +487,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 					SellOrder sellOrder = new SellOrder();
 					sellOrder.setGoodsId(goodsNumMapEntry.getKey());
 					sellOrder.setNum(goodsNumMapEntry.getValue().intValue());
+					sellOrder.setGoodsName(goods.getName());
 					if(StockType.INTERNAL.equals(goods.getStockType())||(StockType.ALL.equals(goods.getStockType())&&AccountType.INTERNAL.equals(accountType))){
 						sellOrder.setStockType(StockType.INTERNAL);
 					}else if(StockType.EXTERNAL.equals(goods.getStockType())||(StockType.ALL.equals(goods.getStockType())&&AccountType.EXTERNAL.equals(accountType))){
@@ -516,6 +517,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 				sellOrder.setParentGoodsId(goodsProcurement.getParentGoodsId());
 				sellOrder.setGoodsId(goodsProcurement.getGoodsId());
 				sellOrder.setNum(1);
+				sellOrder.setGoodsName(goods.getName());
 				if(StockType.INTERNAL.equals(goods.getStockType())||(StockType.ALL.equals(goods.getStockType())&&AccountType.INTERNAL.equals(accountType))){
 					sellOrder.setStockType(StockType.INTERNAL);
 				}else if(StockType.EXTERNAL.equals(goods.getStockType())||(StockType.ALL.equals(goods.getStockType())&&AccountType.EXTERNAL.equals(accountType))){

mec-biz/src/main/resources/config/mybatis/SellOrderMapper.xml

@@ -291,7 +291,7 @@
                 AND FIND_IN_SET(so.organ_id_,#{organIdList})
             </if>
             <if test="goodsName != null and goodsName != ''">
-                AND so.goods_name_ = #{goodsName}
+                AND so.goods_name_ LIKE CONCAT('%',#{goodsName},'%')
             </if>
             <if test="cooperationOrganId != null">
                 AND so.cooperation_organ_id_ = #{cooperationOrganId}