供应商问题处理

hx-supply/src/main/java/com/fjhx/supply/service/supplier/impl/SupplierInfoServiceImpl.java

@@ -131,8 +131,11 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
         //供应商营业执照附件
         ObsFileUtil.saveFile(supplierInfoDto.getLicenseFileList(), supplierInfoDto.getId(), 10);
 
+
         //其他联系人
-        supplierContactService.editLinked(supplierInfoDto.getContactList(), SupplierContact::getSupplierId, supplierInfoDto.getId());
+        List<SupplierContact> contactList = supplierInfoDto.getContactList();
+        contactList.forEach(item -> item.setSupplierId(supplierInfoDto.getId()));
+        supplierContactService.editLinked(contactList, SupplierContact::getSupplierId, supplierInfoDto.getId());
     }
 
     @DSTransactional
@@ -153,7 +156,9 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
         ObsFileUtil.editFile(supplierInfoDto.getLicenseFileList(), supplierInfoDto.getId(), 10);
 
         //其他联系人
-        supplierContactService.editLinked(supplierInfoDto.getContactList(), SupplierContact::getSupplierId, supplierInfoDto.getId());
+        List<SupplierContact> contactList = supplierInfoDto.getContactList();
+        contactList.forEach(item -> item.setSupplierId(supplierInfoDto.getId()));
+        supplierContactService.editLinked(contactList, SupplierContact::getSupplierId, supplierInfoDto.getId());
     }
 
     @DSTransactional

hx-supply/src/main/java/com/fjhx/supply/service/supplier/impl/SupplierPriceServiceImpl.java

@@ -86,7 +86,7 @@ public class SupplierPriceServiceImpl extends ServiceImpl<SupplierPriceMapper, S
             item.setDefinition(product.getDefinition());
             item.setProductClassifyId(product.getProductClassifyId());
             item.setProductType(product.getType());
-            item.setProductCode(product.getCode());
+            item.setProductCode(product.getCustomCode());
             item.setProductName(product.getName());
             item.setProductSpec(product.getSpec());
             item.setProductUnit(product.getUnit());

hx-supply/src/main/resources/mapper/supplier/SupplierPriceMapper.xml

@@ -8,7 +8,8 @@
                sp.price,
                si.name supplierName,
                si.type supplierType,
-               sp.company_id
+               sp.company_id,
+               sp.including_tax_price
         from supplier_price sp
                  inner join supplier_info si on sp.supplier_info_id = si.id
             ${ew.customSqlSegment}