Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-client/src/main/java/org/springblade/client/goods/excel/GoodsExcel.java

@@ -22,6 +22,9 @@ public class GoodsExcel implements Serializable {
 	@ExcelProperty("商品名称(必填)")
 	private String cname;
 
+	@ExcelProperty("品名快捷查询")
+	private String cnameInt;
+
 	@ExcelProperty("分类(必填)")
 	private String type;
 

blade-service/blade-client/src/main/java/org/springblade/client/goods/excel/GoodsInfoExcel.java

@@ -26,6 +26,9 @@ public class GoodsInfoExcel implements Serializable {
 	@ExcelProperty("商品名称(必填)")
 	private String cname;
 
+	@ExcelProperty("品名快捷查询")
+	private String cnameInt;
+
 	@ExcelProperty("产品分类(必填)")
 	private String type;
 

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -213,7 +213,9 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 		Long id = goodsDesc.getId();
 		// 代表主表、子表都是新增,
 		if (id == null) {
-			goodsDesc.setCnameInt(getCnameInt(goodsDesc.getCname()));
+			if (StringUtil.isBlank(goodsDesc.getCnameInt())) {
+				goodsDesc.setCnameInt(getCnameInt(goodsDesc.getCname()));
+			}
 			goodsDesc.setTenantId(AuthUtil.getTenantId());
 			goodsDesc.setCreateTime(new Date());
 			goodsDesc.setCreateUser(SecureUtil.getUserId());
@@ -250,7 +252,9 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 		}
 		// 主表修改,子表看情况
 		else {
-			goodsDesc.setCnameInt(getCnameInt(goodsDesc.getCname()));
+			if (StringUtil.isBlank(goodsDesc.getCnameInt())) {
+				goodsDesc.setCnameInt(getCnameInt(goodsDesc.getCname()));
+			}
 			goodsDescMapper.updateById(goodsDesc);
 			// 价格列表
 			if (CollectionUtils.isNotEmpty(chilList)) {
@@ -334,7 +338,10 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 				GoodsDesc goodsDesc = new GoodsDesc();
 				goodsDesc.setCode(e.getCode());
 				goodsDesc.setCname(e.getCname());
-				goodsDesc.setCnameInt(getCnameInt(goodsDesc.getCname()));
+				goodsDesc.setCnameInt(e.getCnameInt());
+				if (StringUtil.isBlank(goodsDesc.getCnameInt())) {
+					goodsDesc.setCnameInt(getCnameInt(goodsDesc.getCname()));
+				}
 				goodsDesc.setBrandItem(e.getBrandItem());
 				goodsDesc.setBrand(e.getBrand());
 				goodsDesc.setTypeno(e.getTypeNo());
@@ -414,7 +421,10 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 			if (goodsType != null) {
 				GoodsDesc goodsDesc = new GoodsDesc();
 				BeanUtils.copyProperties(e, goodsDesc);
-				goodsDesc.setCnameInt(getCnameInt(goodsDesc.getCname()));
+
+				if (StringUtil.isBlank(goodsDesc.getCnameInt())) {
+					goodsDesc.setCnameInt(getCnameInt(goodsDesc.getCname()));
+				}
 
 				R<CorpsDesc> corpByName = corpsDescClient.getCorpByName(e.getCorpName(), AuthUtil.getTenantId());
 				if (corpByName.isSuccess() && corpByName.getData() != null) {

blade-service/blade-stock/src/main/java/org/springblade/stock/mapper/StockGoodsMapper.xml

@@ -108,7 +108,7 @@
             and t1.tenant_id = #{stock.tenantId}
             and t4.tenant_id = #{stock.tenantId}
             <if test="stock.goodsInt != null and stock.goodsInt != ''">
-                and t2.cname_int like concat('%', #{stock.goodsInt}, '%')
+                and (t2.cname_int like concat('%', #{stock.goodsInt}, '%') or t2.cname like concat('%', #{stock.goodsInt}, '%'))
             </if>
             <if test="stock.brand != null and stock.brand != ''">
                 and t2.brand = #{stock.brand}