diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/DsxyyClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/DsxyyClient.java index a84c32a..b9469b9 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/DsxyyClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/DsxyyClient.java @@ -15,6 +15,7 @@ import com.glxp.mipsdl.admin.dao.inout.CodesDao; import com.glxp.mipsdl.admin.dao.inout.OrderDao; import com.glxp.mipsdl.admin.dao.inventory.InvWarehouseDao; import com.glxp.mipsdl.admin.dao.thrsys.ThrInvWarehouseDao; +import com.glxp.mipsdl.admin.dao.thrsys.ThrProductsDao; import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity; import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity; @@ -95,6 +96,8 @@ public class DsxyyClient { private CodesDao codesDao; @Resource private StockOrderUploadLogService stockOrderUploadLogService; + @Resource + private ThrProductsDao thrProductsDao; public String[] getHeaderArray() { List headArray = new ArrayList<>(6); @@ -307,7 +310,7 @@ public class DsxyyClient { item.setStandard(stockOrderDetailEntity.getSpec()); item.setRegisterNo(stockOrderDetailEntity.getZczbhhzbapzbh()); try { - item.setPrice(stockOrderDetailEntity.getPrice() + ""); + item.setFirstSalesInvNo(stockOrderDetailEntity.getFirstSalesInvNo()); item.setSecSalesInvNo(stockOrderDetailEntity.getSecSalesInvNo()); item.setInvoiceDate(stockOrderDetailEntity.getInvoiceDate()); @@ -321,6 +324,10 @@ public class DsxyyClient { } else { item.setProductId(thrProductsEntity.getCode()); item.setProductName(thrProductsEntity.getName()); + + //查询此产品对应的第三方产品价格,使用东山物资系统维护的价格信息 + String price = thrProductsDao.selectPriceByCode(thrProductsEntity.getCode()); + item.setPrice(price); } items.add(item); diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/thrsys/ThrProductsDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/thrsys/ThrProductsDao.java new file mode 100644 index 0000000..b7aa4c6 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/thrsys/ThrProductsDao.java @@ -0,0 +1,16 @@ +package com.glxp.mipsdl.admin.dao.thrsys; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface ThrProductsDao { + + /** + * 查询第三方产品维护的价格 + * + * @param code + * @return + */ + String selectPriceByCode(@Param("code") String code); +} diff --git a/api-sync/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/api-sync/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml new file mode 100644 index 0000000..bb93744 --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file