From 941941f31bc8fac224c752cc91c2684bfe746c1b Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 8 Feb 2023 14:33:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=B3=BB=E7=BB=9F=E6=8E=92=E5=BA=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E8=BF=98=E6=9C=89=E4=BB=B7=E6=A0=BC=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E4=B8=8D=E4=B8=8A=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mipsdl/admin/client/http/PhxyyClient.java | 28 ++--- .../admin/dao/basic/UdiRelevanceDao.java | 5 + .../admin/req/basic/FilterUdiInfoRequest.java | 63 +++++++++++ .../admin/res/basic/UdiRelevanceResponse.java | 101 ++++++++++++++++++ .../admin/service/basic/BasicUdiService.java | 39 +++++++ .../main/resources/application-pro.properties | 8 +- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 84 ++++++++++++++- 7 files changed, 310 insertions(+), 18 deletions(-) create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/basic/FilterUdiInfoRequest.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/res/basic/UdiRelevanceResponse.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/service/basic/BasicUdiService.java diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java index ed70d82..c86879b 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java @@ -8,18 +8,15 @@ import com.alibaba.fastjson.TypeReference; import com.glxp.mipsdl.admin.config.ThirdSysConfig; import com.glxp.mipsdl.admin.constant.ConstantStatus; import com.glxp.mipsdl.admin.constant.ConstantType; -import com.glxp.mipsdl.admin.dao.basic.BasicThirdSysBusApiDao; -import com.glxp.mipsdl.admin.dao.basic.BussinessLocalTypeDao; -import com.glxp.mipsdl.admin.dao.basic.BussinessTypeDao; -import com.glxp.mipsdl.admin.dao.basic.UdiRelevanceDao; +import com.glxp.mipsdl.admin.dao.basic.*; import com.glxp.mipsdl.admin.dao.business.StockOrderDao; import com.glxp.mipsdl.admin.dao.business.StockOrderDetailDao; 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.basic.BasicThirdSysDetailDao; import com.glxp.mipsdl.admin.dao.thrsys.ThrInvWarehouseDao; import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity; import com.glxp.mipsdl.admin.entity.business.StockOrderDetailEntity; @@ -28,7 +25,6 @@ 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.InvWarehouseEntity; -import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrCorpEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrProductsEntity; @@ -39,9 +35,10 @@ import com.glxp.mipsdl.admin.req.basic.BussinessLocalTypeFilterRequest; import com.glxp.mipsdl.admin.req.phxyy.*; import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest; import com.glxp.mipsdl.admin.res.basic.BussinessOriginTypeResponse; +import com.glxp.mipsdl.admin.service.StockOrderUploadLogService; import com.glxp.mipsdl.admin.service.basic.BasicThirdSysBusApiService; +import com.glxp.mipsdl.admin.service.basic.BasicUdiService; import com.glxp.mipsdl.admin.service.basic.BussinessOriginTypeService; -import com.glxp.mipsdl.admin.service.StockOrderUploadLogService; import com.glxp.mipsdl.admin.util.DateUtil; import com.glxp.mipsdl.admin.util.HttpClient; import com.glxp.mipsdl.admin.util.SubmitOrderUtils; @@ -53,7 +50,9 @@ import org.springframework.http.HttpHeaders; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.DecimalFormat; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -325,7 +324,10 @@ public class PhxyyClient { item.setStandard(stockOrderDetailEntity.getSpec()); item.setRegisterNo(stockOrderDetailEntity.getZczbhhzbapzbh()); try { - item.setPrice(stockOrderDetailEntity.getPrice() + ""); + DecimalFormat df44 = new DecimalFormat("#.00"); + if (stockOrderDetailEntity.getPrice() != null) { + item.setPrice(df44.format(stockOrderDetailEntity.getPrice().doubleValue() * stockOrderDetailEntity.getCount().intValue())); + } item.setFirstSalesInvNo(stockOrderDetailEntity.getFirstSalesInvNo()); item.setSecSalesInvNo(stockOrderDetailEntity.getSecSalesInvNo()); item.setInvoiceDate(stockOrderDetailEntity.getInvoiceDate()); @@ -350,7 +352,7 @@ public class PhxyyClient { return ResultVOUtils.error(500, "提交失败"); } } - + Collections.reverse(items); udiwmsOrderRequest.setItem(items); BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("orderSubmitUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); //记录日志 @@ -391,6 +393,8 @@ public class PhxyyClient { } } + @Resource + BasicUdiService basicUdiService; public List transferSerList(List stockOrderDetailEntities, String orderId) { List resultList = new ArrayList<>(); @@ -404,10 +408,10 @@ public class PhxyyClient { ) { StockOrderDetailEntity item = new StockOrderDetailEntity(); BeanUtils.copyProperties(stockOrderDetailEntity, item); -// item.setCode(codeDetaiEntity.getCode()); item.setSerialNo(codeDetaiEntity.getSerialNo()); - item.setCount(codeDetaiEntity.getCount()); - item.setReCount(codeDetaiEntity.getCount()); + int count = codeDetaiEntity.getCount() * basicUdiService.getActCount(item.getRelId(), codeDetaiEntity.getNameCode()); + item.setCount(count); + item.setReCount(count); resultList.add(item); } } diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/UdiRelevanceDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/UdiRelevanceDao.java index 293ad33..62a59f4 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/UdiRelevanceDao.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/UdiRelevanceDao.java @@ -1,12 +1,17 @@ package com.glxp.mipsdl.admin.dao.basic; import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.mipsdl.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.mipsdl.admin.res.basic.UdiRelevanceResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface UdiRelevanceDao { UdiRelevanceEntity selectById(@Param("id") String id); + List filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest); } diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/basic/FilterUdiInfoRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/basic/FilterUdiInfoRequest.java new file mode 100644 index 0000000..0d1065b --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/basic/FilterUdiInfoRequest.java @@ -0,0 +1,63 @@ +package com.glxp.mipsdl.admin.req.basic; + +import com.glxp.mipsdl.admin.req.ListPageRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class FilterUdiInfoRequest extends ListPageRequest { + + private String ylqxzcrbarmc; + private String cpmctymc; + private String nameCode; + private String uuid; + private String ggxh; + private String thirdId; + private String id; + + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + + + private String thirdCode; + private String thirdSys; + + private String lastUpdateTime; + private String zczbhhzbapzbh; + private Integer diType; + + + private String unionCode; + private String udiCode; + private String thrPiId; + + + private Boolean isCheck; + + private Integer filterType; //0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码 + + private Integer lockStatus; + private String customerId; + private String udplatCode; + private String mainId; + private Boolean isAdavence; + private String corpId; + private String billType; + + private String ybbm; + private String sptm; + private String unionFilterStr;//产品名称，规格，批文，生产厂家联合查询 + + private Boolean isDisable; + List relIds; + private String uniqueNameCode; + private String supName; + private String unitFk; + private String originUuid; + private String relId; + private String companyName; + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/res/basic/UdiRelevanceResponse.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/res/basic/UdiRelevanceResponse.java new file mode 100644 index 0000000..6633cd3 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/res/basic/UdiRelevanceResponse.java @@ -0,0 +1,101 @@ +package com.glxp.mipsdl.admin.res.basic; + +import lombok.Data; + +@Data +public class UdiRelevanceResponse { + + private Integer id; + private String thirdId; + private String thirdName; + private String uuid; + private String nameCode; + private String packLevel; + private String packRatio; + private Integer bhxjsl; + private Integer bhzxxsbzsl; + private Integer zxxsbzbhsydysl; + private String bhxjcpbm; + private String sjcpbm; // + private String bzcj; + private String addType; + private String deviceRecordKey; + private int isUseDy; + private String cpmctymc; + private String cplb; + private String flbm; + private String ggxh; + private String qxlb; + private String tyshxydm; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; + private String ylqxzcrbarywmc; + private String sydycpbs; + private int versionNumber; + private int diType; + private String batchNo; + private String warehouseName; + private String thirdId1; + private String thirdName1; + private String thirdId2; + private String thirdName2; + private String thirdId3; + private String thirdName3; + private String thirdId4; + private String thirdName4; + private String ybbm; + private String sptm; + private Boolean isDisable; + private String erpId; + private String erpName; + private Integer productType; + private Boolean isSelect; + private Boolean isLock; + private String mainId; + private String mainName; + private Integer lockStatus; + private String udplatCode; + private Boolean isAdavence; + private String scbssfbhph; + private String scbssfbhxlh; + private String scbssfbhscrq; + private String scbssfbhsxrq; + private String cpms; + private String supName; + private String manufactory; + private String measname; + private String unitFk; + private String companyName; + private String originUuid; + private boolean allowNoBatch; + private boolean allowNoExpire; + private boolean allowNoProduct; + private String spmc; + private String cplx; + private String hchzsb; + + private String price; + + + private String basicPrductRemak1; + private String basicPrductRemak2; + private String basicPrductRemak3; + private String basicPrductRemak4; + private String basicPrductRemak5; + private String basicPrductRemak6; + private String basicPrductRemak7; + private String basicPrductRemak8; + private Boolean useMuti; //是否多次使用 + private Integer useNum; //最小包装单元可使用次数 + private Integer pid; //用来存父id + + //产品代理商 + private String cpdls; + + public int getBhzxxsbzsl() { + if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { + return 1; + } else + return bhzxxsbzsl; + } +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/service/basic/BasicUdiService.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/service/basic/BasicUdiService.java new file mode 100644 index 0000000..d17f5e8 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/service/basic/BasicUdiService.java @@ -0,0 +1,39 @@ +package com.glxp.mipsdl.admin.service.basic; + +import com.glxp.mipsdl.admin.dao.basic.UdiRelevanceDao; +import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.mipsdl.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.mipsdl.admin.res.basic.UdiRelevanceResponse; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class BasicUdiService { + @Resource + UdiRelevanceDao udiRelevanceDao; + + public int getActCount(String relId, String nameCode) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectById(relId); + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setUniqueNameCode(nameCode); + List udiRelevanceResponses = udiRelevanceDao.filterUdiRelevance(filterUdiInfoRequest); + + UdiRelevanceResponse udiInfoBean = null; + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { + udiInfoBean = udiRelevanceResponses.get(0); + } + if (udiInfoBean != null) { + if ((udiRelevanceEntity.getIsUseDy() != null && udiRelevanceEntity.getIsUseDy()) && udiInfoBean.getDiType() != 2) { + if (udiInfoBean.getBhzxxsbzsl() == 0) + return udiInfoBean.getZxxsbzbhsydysl(); + else + return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl(); + } else { + return udiInfoBean.getBhzxxsbzsl(); + } + } + return 1; + } +} diff --git a/api-sync/src/main/resources/application-pro.properties b/api-sync/src/main/resources/application-pro.properties index 8f21e16..6ad66ae 100644 --- a/api-sync/src/main/resources/application-pro.properties +++ b/api-sync/src/main/resources/application-pro.properties @@ -28,12 +28,12 @@ UDIWMS_IP=http://127.0.0.1:9991 API_KEY=1102 API_SECRET=4dc07484afd34e8083ba96e8fe564224 #\u6587\u4EF6\u5BFC\u5165 -#0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09\uFF0C1.GLXP(\u81EA\u5B9A\u4E49\u89C4\u8303\u6807\u51C6\uFF09\uFF0C2.ZHIYE_V1(\u667A\u4E1AV1,\u8BCF\u5B89\u533B\u9662),3.YG_UDPLAT_V1(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0\uFF09,4.PHXYY(\u5E73\u548C\u53BF\u533B\u9662), 5.DSXYY(\u4E1C\u5C71\u53BF\u533B\u9662), 6.YXXZYY(\u4E91\u9704\u53BF\u4E2D\u533B\u9662) -FILE_VERSION_FLAG=YXXZYY +#0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09\uFF0C1.GLXP(\u81EA\u5B9A\u4E49\u89C4\u8303\u6807\u51C6\uFF09\uFF0C2.ZHIYE_V1(\u667A\u4E1AV1,\u8BCF\u5B89\u533B\u9662),3.YG_UDPLAT_V1(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0\uFF09,4.PHXYY(\u5E73\u548C\u53BF\u533B\u9662), 5.DSXYY(\u4E1C\u5C71\u53BF\u533B\u9662), 6.YXZXYY(\u4E91\u9704\u4E2D\u533B\u9662) +FILE_VERSION_FLAG=PHXYY #\u63A5\u53E3\u5B9E\u65F6\u83B7\u53D6 -#0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09,1.YONGYOU_U8_V3.1(\u7528\u53CB3.1\u7248\u672C\uFF0C\u7247\u4ED4\u7640\u8BCA\u65AD\uFF09 2.YG_UDPLAT_V1.0(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0) 3.TEST(\u6807\u51C6\u63A5\u53E3\uFF0C\u6D4B\u8BD5\u7528),4.PHXYY(\u5E73\u548C\u53BF\u533B\u9662),5.DSXYY(\u4E1C\u5C71\u53BF\u533B\u9662), 6.YXXZYY(\u4E91\u9704\u53BF\u4E2D\u533B\u9662) +#0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09,1.YONGYOU_U8_V3.1(\u7528\u53CB3.1\u7248\u672C\uFF0C\u7247\u4ED4\u7640\u8BCA\u65AD\uFF09 2.YG_UDPLAT_V1.0(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0) 3.TEST(\u6807\u51C6\u63A5\u53E3\uFF0C\u6D4B\u8BD5\u7528),4.PHXYY(\u5E73\u548C\u53BF\u533B\u9662),5.DSXYY(\u4E1C\u5C71\u53BF\u533B\u9662), 6.YXZXYY(\u4E91\u9704\u4E2D\u533B\u9662) #5.ZAXZYY(\u8BCF\u5B89\u53BF\u533B\u9662) -ONLINE_VESRION_FLAG=YXXZYY +ONLINE_VESRION_FLAG=PHXYY THIRD_ID=thirdId ok.http.connect-timeout=30000 ok.http.read-timeout=30000 diff --git a/api-sync/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-sync/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 06acea0..97ab62b 100644 --- a/api-sync/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-sync/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -2,12 +2,92 @@ - - + \ No newline at end of file