|
|
@@ -24,6 +24,7 @@ import com.usoftchina.saas.document.service.ProductService;
|
|
|
import com.usoftchina.saas.document.service.WarehouseService;
|
|
|
import com.usoftchina.saas.exception.BizException;
|
|
|
import com.usoftchina.saas.page.PageRequest;
|
|
|
+import com.usoftchina.saas.utils.RegexpUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
@@ -89,8 +90,10 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
|
|
|
validRepeatWarehouse(productDetailList);
|
|
|
|
|
|
if(product.getId() == 0){
|
|
|
+ String prCode = product.getPr_code().trim().toUpperCase();
|
|
|
+ prCode = RegexpUtils.replaceSpecCharacter(prCode);
|
|
|
//保存
|
|
|
- String code = pushMaxnubmer(product.getPr_code(), product.getId());
|
|
|
+ String code = pushMaxnubmer(prCode, product.getId());
|
|
|
product.setCompanyId(companyId);
|
|
|
product.setCreatorId(userId);
|
|
|
product.setCreateTime(new Date());
|