|
@@ -428,9 +428,15 @@ public class SaleInterfaceSyncServiceImpl extends ServiceImpl<SaleInterfaceSyncM
|
|
|
|
|
|
QueryWrapper<BaseProductArchive> queryWrapperProduct = new QueryWrapper();
|
|
|
queryWrapperProduct.eq("del_flag", "0");
|
|
|
- queryWrapperProduct.eq("english_name", description);
|
|
|
- queryWrapperProduct.eq("partno", supplierPartNumber);
|
|
|
- queryWrapperProduct.eq("measurement_unit", unitOfMeasure);
|
|
|
+
|
|
|
+ if(StringUtils.isNotBlank(supplierPartNumber)){
|
|
|
+
|
|
|
+ queryWrapperProduct.eq("partno", supplierPartNumber);
|
|
|
+ }else{
|
|
|
+
|
|
|
+ queryWrapperProduct.eq("english_name", description);
|
|
|
+ queryWrapperProduct.eq("measurement_unit", unitOfMeasure);
|
|
|
+ }
|
|
|
|
|
|
List<BaseProductArchive> listProduct = baseProductArchiveService.list(queryWrapperProduct);
|
|
|
BaseProductArchive baseProductArchive = new BaseProductArchive();
|