From 7858e594268a80acf154615ec7affb39a905950d Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Fri, 5 Aug 2022 15:15:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=8F=E5=AE=89=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0=EF=BC=8C=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E4=B8=8D=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=8A=B6=E6=80=81=E9=97=AE=E9=A2=98=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E6=95=88=E9=AA=8C=E6=94=B6=E4=BA=BA=E9=97=AE=E9=A2=98=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mipsdl/admin/client/http/ZaxyyClient.java | 24 +++++++--- .../dao/inventory/InvSubWarehouseDao.java | 21 +++++++++ .../admin/dao/thrsys/ThrInvWarehouseDao.java | 2 + .../dao/thrsys/ThrSubInvWarehouseDao.java | 17 +++++++ .../inventory/InvSubWarehouseEntity.java | 25 +++++++++++ .../thrsys/ThrSubInvWarehouseEntity.java | 17 +++++++ .../mapper/inventory/InvSubWarehouseDao.xml | 16 +++++++ .../mapper/thrsys/ThrSubInvWarehouseDao.xml | 45 +++++++++++++++++++ 8 files changed, 162 insertions(+), 5 deletions(-) create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inventory/InvSubWarehouseDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/thrsys/ThrSubInvWarehouseDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inventory/InvSubWarehouseEntity.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrSubInvWarehouseEntity.java create mode 100644 api-sync/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/thrsys/ThrSubInvWarehouseDao.xml diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java index 42fe2cd..136b220 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java @@ -17,9 +17,11 @@ import com.glxp.mipsdl.admin.dao.business.StockOrderDetailDao; import com.glxp.mipsdl.admin.dao.business.StockOrderUploadLogDao; import com.glxp.mipsdl.admin.dao.inout.CodesDao; import com.glxp.mipsdl.admin.dao.inout.OrderDao; +import com.glxp.mipsdl.admin.dao.inventory.InvSubWarehouseDao; import com.glxp.mipsdl.admin.dao.inventory.InvWarehouseDao; import com.glxp.mipsdl.admin.dao.phxyy.BasicThirdSysDetailDao; import com.glxp.mipsdl.admin.dao.thrsys.ThrInvWarehouseDao; +import com.glxp.mipsdl.admin.dao.thrsys.ThrSubInvWarehouseDao; import com.glxp.mipsdl.admin.entity.auth.AuthAdmin; import com.glxp.mipsdl.admin.entity.basic.*; import com.glxp.mipsdl.admin.entity.business.StockOrderDetailEntity; @@ -27,9 +29,11 @@ import com.glxp.mipsdl.admin.entity.business.StockOrderEntity; import com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity; import com.glxp.mipsdl.admin.entity.inout.OrderEntity; import com.glxp.mipsdl.admin.entity.inout.WarehouseEntity; +import com.glxp.mipsdl.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity; import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysDetailEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.mipsdl.admin.entity.thrsys.ThrSubInvWarehouseEntity; import com.glxp.mipsdl.admin.entity.zy.ZaZyHeareRequest; import com.glxp.mipsdl.admin.req.*; import com.glxp.mipsdl.admin.req.basic.BussinessLocalTypeFilterRequest; @@ -76,8 +80,12 @@ public class ZaxyyClient { @Resource private InvWarehouseDao invWarehouseDao; @Resource + private InvSubWarehouseDao invSubWarehouseDao; + @Resource private ThrInvWarehouseDao thrInvWarehouseDao; @Resource + private ThrSubInvWarehouseDao thrSubInvWarehouseDao; + @Resource private UnitMaintainDao unitMaintainDao; @Resource private BussinessTypeDao bussinessTypeDao; @@ -272,6 +280,7 @@ public class ZaxyyClient { AuthAdmin authAdmin = authAdminDao.findById(userId.longValue()); udiwmsOrderRequest.setThirdSys(authAdmin.getEmployeeName()); //第三方系统标识 udiwmsOrderRequest.setBillType(thirdSysBusApiEntity.getThirdBuyCode()); + udiwmsOrderRequest.setBillFlag("1"); if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) { udiwmsOrderRequest.setCorpId(stockOrderEntity.getCorpName()); //往来单位编码，需转换为第三方系统的ID @@ -306,15 +315,14 @@ public class ZaxyyClient { } } - InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOneByCode(orderEntity.getFromSubInvCode()); + InvSubWarehouseEntity invWarehouseEntity = invSubWarehouseDao.selectOneByCode(orderEntity.getInvWarehouseCode()); try { - ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(invWarehouseEntity.getThirdId(), thirdId); - udiwmsOrderRequest.setLocStorageCode(thrInvWarehouseEntity.getCode()); - udiwmsOrderRequest.setLocStorageName(thrInvWarehouseEntity.getName()); + ThrSubInvWarehouseEntity thrInvWarehouseEntity = thrSubInvWarehouseDao.selectByCode(invWarehouseEntity.getThirdId(), thirdId); + udiwmsOrderRequest.setLocInvCode(thrInvWarehouseEntity.getCode()); + udiwmsOrderRequest.setLocInvName(thrInvWarehouseEntity.getName()); } catch (Exception e) { log.error("查询第三方系统仓库异常", e); } - udiwmsOrderRequest.setBillFlag(stockOrderEntity.getBillFlag()); //单据状态 //查询单据出入库类型 String mainAction = bussinessTypeDao.selectInoutTypebByLocalAction(stockOrderEntity.getBillType()); if (ConstantType.TYPE_PUT.equals(mainAction)) { @@ -340,6 +348,12 @@ public class ZaxyyClient { item.setMeasname(udiRelevanceEntity.getMeasname()); item.setStandard(stockOrderDetailEntity.getSpec()); item.setRegisterNo(stockOrderDetailEntity.getZczbhhzbapzbh()); + + item.setPrice(stockOrderDetailEntity.getPrice()); + item.setFirstSalesInvNo(stockOrderDetailEntity.getFirstSalesInvNo()); + item.setSecSalesInvNo(stockOrderDetailEntity.getSecSalesInvNo()); + item.setInvoiceDate(stockOrderDetailEntity.getInvoiceDate()); + item.setSecSalesListNo(stockOrderDetailEntity.getSecSalesListNo()); List warehouseEntityList = filterCodes(stockOrderDetailEntity, warehouseEntities); if (CollUtil.isNotEmpty(warehouseEntityList)) { List codeDetaiEntities = new ArrayList<>(); diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inventory/InvSubWarehouseDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inventory/InvSubWarehouseDao.java new file mode 100644 index 0000000..3ee0543 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inventory/InvSubWarehouseDao.java @@ -0,0 +1,21 @@ +package com.glxp.mipsdl.admin.dao.inventory; + +import com.glxp.mipsdl.admin.entity.inventory.InvSubWarehouseEntity; +import com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface InvSubWarehouseDao { + + List selectByCode(String code); + + /** + * 查询单个仓库 + * + * @param locStorageCode + * @return + */ + InvSubWarehouseEntity selectOneByCode(String code); +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/thrsys/ThrInvWarehouseDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/thrsys/ThrInvWarehouseDao.java index 91aa2d4..63837f1 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/thrsys/ThrInvWarehouseDao.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/thrsys/ThrInvWarehouseDao.java @@ -2,10 +2,12 @@ package com.glxp.mipsdl.admin.dao.thrsys; import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface ThrInvWarehouseDao { List filterThrInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest); diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/thrsys/ThrSubInvWarehouseDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/thrsys/ThrSubInvWarehouseDao.java new file mode 100644 index 0000000..b003a6f --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/thrsys/ThrSubInvWarehouseDao.java @@ -0,0 +1,17 @@ +package com.glxp.mipsdl.admin.dao.thrsys; + +import com.glxp.mipsdl.admin.entity.thrsys.ThrSubInvWarehouseEntity; +import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrSubInvWarehouseDao { + + List filterThrInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest); + + ThrSubInvWarehouseEntity selectByCode(@Param("code") String code, @Param("thirdSysFk") String thirdSysFk); + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inventory/InvSubWarehouseEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inventory/InvSubWarehouseEntity.java new file mode 100644 index 0000000..2169e2d --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inventory/InvSubWarehouseEntity.java @@ -0,0 +1,25 @@ +package com.glxp.mipsdl.admin.entity.inventory; + +import lombok.Data; + +@Data +public class InvSubWarehouseEntity { + + public String id; + public String code; + public String name; + public String parentId; + public String remark; + public boolean defaultInv; + + public String thirdId; + public String thirdName; + public String thirdId1; + public String thirdName1; + public String thirdId2; + public String thirdName2; + public String thirdId3; + public String thirdName3; + public String thirdId4; + public String thirdName4; +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrSubInvWarehouseEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrSubInvWarehouseEntity.java new file mode 100644 index 0000000..9fff360 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrSubInvWarehouseEntity.java @@ -0,0 +1,17 @@ +package com.glxp.mipsdl.admin.entity.thrsys; + +import lombok.Data; + +@Data +public class ThrSubInvWarehouseEntity { + + + private String id; + private String code; + private String name; + private String parentId; + private String remark; + private String thirdSysFk; + + +} diff --git a/api-sync/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml b/api-sync/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml new file mode 100644 index 0000000..115c21d --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/api-sync/src/main/resources/mybatis/mapper/thrsys/ThrSubInvWarehouseDao.xml b/api-sync/src/main/resources/mybatis/mapper/thrsys/ThrSubInvWarehouseDao.xml new file mode 100644 index 0000000..e29c82f --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/thrsys/ThrSubInvWarehouseDao.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + \ No newline at end of file