diff --git a/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java b/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java index 44f92cc..fb54b35 100644 --- a/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java @@ -10,7 +10,6 @@ import com.glxp.mipsdl.req.ctqyy.GetSickPrescribeRequest; import com.glxp.mipsdl.req.ctqyy.GetSickRequest; import com.glxp.mipsdl.req.post.*; import com.glxp.mipsdl.res.BaseResponse; -import com.glxp.mipsdl.res.udiwms.InvProductRequest; import org.springframework.web.bind.annotation.RequestBody; /** @@ -294,4 +293,7 @@ public interface BaseHttpClient { * @return */ BaseResponse getPrescribesQx(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest); + + BaseResponse getBuyType(); + } diff --git a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java index f8867fb..1e04c55 100644 --- a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java @@ -41,7 +41,9 @@ import javax.sql.DataSource; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.SQLException; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Slf4j @Service @@ -347,4 +349,9 @@ public abstract class CommonHttpClient implements BaseHttpClient { return databaseProductName; } + @Override + public BaseResponse getBuyType() { + return null; + } + } diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index 572e877..c1a5689 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -77,6 +77,10 @@ import java.util.stream.Collectors; @Slf4j @Service(value = "100011HttpClient") public class CtqyyClient extends CommonHttpClient { + private final String[] buyType_3501 = {"24"}; + private final String[] buyType_3502 = {"7", "6", "5", "4", "1", "16", "12", "28", "35"}; + private final String[] buyType_3505 = {"QXCF001", "YPCF002"}; + private final String[] buyType_3506 = {"YPTH001"}; @Resource AuthWarehouseUserMapper authWarehouseUserMapper; @Resource @@ -1639,10 +1643,7 @@ public class CtqyyClient extends CommonHttpClient { */ @Override public BaseResponse uploadCollectOrder(PostCollectOrderRequest postCollectOrderRequest) { - String[] buyType_3501 = {"24"}; - String[] buyType_3502 = {"7", "6", "5", "4", "1", "16", "12", "28", "35"}; - String[] buyType_3505 = {"QXCF001", "YPCF002"}; - String[] buyType_3506 = {"YPTH001"}; + List collectOrderList = postCollectOrderRequest.getCollectOrderList(); @@ -2262,4 +2263,18 @@ public class CtqyyClient extends CommonHttpClient { JSONObject dataJson = JSONObject.parseObject(jsonStr); ybClient.ybPost("3506A", dataJson); } + /** + * 获取交易类型集合 + * + * @return + */ + @Override + public BaseResponse getBuyType() { + Map buyTypeMap= new HashMap<>(); + buyTypeMap.put("buyType_3501",buyType_3501); + buyTypeMap.put("buyType_3502",buyType_3502); + buyTypeMap.put("buyType_3505",buyType_3505); + buyTypeMap.put("buyType_3506",buyType_3506); + return ResultVOUtils.success(buyTypeMap); + } } diff --git a/src/main/java/com/glxp/mipsdl/client/dsxyy/DsxyyClient.java b/src/main/java/com/glxp/mipsdl/client/dsxyy/DsxyyClient.java index cd7fcae..c83c488 100644 --- a/src/main/java/com/glxp/mipsdl/client/dsxyy/DsxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/dsxyy/DsxyyClient.java @@ -58,10 +58,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -490,4 +487,6 @@ public class DsxyyClient extends CommonHttpClient { public BaseResponse submitPreInOrders(UdiwmsPreInOrderRequest udiwmsPreInOrderRequest) { return null; } + + } diff --git a/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java b/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java index 2994142..932f011 100644 --- a/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java @@ -79,6 +79,10 @@ import java.util.stream.Collectors; @Slf4j @Service(value = "100014HttpClient") public class ScpwxyyClient extends CommonHttpClient { + private final String[] buyType_3501 = {"24"}; + private final String[] buyType_3502 = {"7", "6", "5", "4", "1", "16", "12", "28", "35"}; + private final String[] buyType_3505 = {"QXCF001", "YPCF002"}; + private final String[] buyType_3506 = {"YPTH001"}; @Resource private ThrSystemDetailService thrSystemDetailService; @@ -1599,10 +1603,7 @@ public class ScpwxyyClient extends CommonHttpClient { */ @Override public BaseResponse uploadCollectOrder(PostCollectOrderRequest postCollectOrderRequest) { - String[] buyType_3501 = {"24"}; - String[] buyType_3502 = {"7", "6", "5", "4", "1", "16", "12", "28", "35"}; - String[] buyType_3505 = {"QXCF001", "YPCF002"}; - String[] buyType_3506 = {"YPTH001"}; + List collectOrderList = postCollectOrderRequest.getCollectOrderList(); @@ -2049,4 +2050,14 @@ public class ScpwxyyClient extends CommonHttpClient { JSONObject dataJson = JSONObject.parseObject(jsonStr); ybClient.ybPostScyh("3506A", dataJson); } + + @Override + public BaseResponse getBuyType() { + Map buyTypeMap= new HashMap<>(); + buyTypeMap.put("buyType_3501",buyType_3501); + buyTypeMap.put("buyType_3502",buyType_3502); + buyTypeMap.put("buyType_3505",buyType_3505); + buyTypeMap.put("buyType_3506",buyType_3506); + return ResultVOUtils.success(buyTypeMap); + } } diff --git a/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java index fcc4a52..e104f51 100644 --- a/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java @@ -25,7 +25,6 @@ import com.glxp.mipsdl.constant.ConstantType; import com.glxp.mipsdl.constant.Constants; import com.glxp.mipsdl.dao.auth.AuthUserDao; import com.glxp.mipsdl.dao.auth.AuthWarehouseDao; -import com.glxp.mipsdl.dao.auth.AuthWarehouseUserMapper; import com.glxp.mipsdl.dao.basic.*; import com.glxp.mipsdl.dao.inout.*; import com.glxp.mipsdl.dao.thrsys.ThrInvWarehouseDao; @@ -75,6 +74,10 @@ import java.util.stream.Collectors; @Slf4j @Service(value = "100013HttpClient") public class YxfyyyClient extends CommonHttpClient { + private final String[] buyType_3501 = {"24"}; + private final String[] buyType_3502 = {"7", "6", "5", "4", "1", "16", "12", "28", "35"}; + private final String[] buyType_3505 = {"QXCF001", "YPCF002"}; + private final String[] buyType_3506 = {"YPTH001"}; @Resource private ThrSystemDetailService thrSystemDetailService; @@ -135,6 +138,7 @@ public class YxfyyyClient extends CommonHttpClient { private YbClient ybClient; @Resource private RelCodeDetailService relCodeDetailService; + /** * 拼接xml请求头 * @@ -656,7 +660,7 @@ public class YxfyyyClient extends CommonHttpClient { .selectList(Wrappers.lambdaQuery(IoOrderInvoiceEntity.class).eq(IoOrderInvoiceEntity::getOrderIdFk, orderEntity.getBillNo()) .eq(IoOrderInvoiceEntity::getBindRlFk, i.getBindRlFk()) .eq(StrUtil.isNotEmpty(i.getBatchNo()), IoOrderInvoiceEntity::getBatchNo, i.getBatchNo()). - groupBy(IoOrderInvoiceEntity::getInvoiceEncode)); + groupBy(IoOrderInvoiceEntity::getInvoiceEncode)); if (CollectionUtil.isNotEmpty(invoiceList)) { fphm = invoiceList.stream().map(IoOrderInvoiceEntity::getInvoiceEncode).collect(Collectors.joining(",")); if (invoiceList.get(0).getInvoiceDate() != null) @@ -1592,10 +1596,7 @@ public class YxfyyyClient extends CommonHttpClient { */ @Override public BaseResponse uploadCollectOrder(PostCollectOrderRequest postCollectOrderRequest) { - String[] buyType_3501 = {"24"}; - String[] buyType_3502 = {"7", "6", "5", "4", "1", "16", "12", "28", "35"}; - String[] buyType_3505 = {"QXCF001", "YPCF002"}; - String[] buyType_3506 = {"YPTH001"}; + List collectOrderList = postCollectOrderRequest.getCollectOrderList(); @@ -1619,6 +1620,7 @@ public class YxfyyyClient extends CommonHttpClient { return ResultVOUtils.success(); } + // 辅助方法，用于检查busType是否存在于指定的buyType数组中 private static boolean matchBusType(String busType, String[] buyTypes) { for (String buyType : buyTypes) { @@ -2030,4 +2032,18 @@ public class YxfyyyClient extends CommonHttpClient { JSONObject dataJson = JSONObject.parseObject(jsonStr); ybClient.ybPost("3506A", dataJson); } + + /** + * 获取交易类型集合 + * + * @return + */ + public BaseResponse getBuyType() { + Map buyTypeMap= new HashMap<>(); + buyTypeMap.put("buyType_3501",buyType_3501); + buyTypeMap.put("buyType_3502",buyType_3502); + buyTypeMap.put("buyType_3505",buyType_3505); + buyTypeMap.put("buyType_3506",buyType_3506); + return ResultVOUtils.success(buyTypeMap); + } } diff --git a/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java b/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java index cba689b..0424a4d 100644 --- a/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java +++ b/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java @@ -1,7 +1,6 @@ package com.glxp.mipsdl.controller; import com.glxp.mipsdl.client.ClientProcessor; -import com.glxp.mipsdl.client.ctqyy.entity.InvProjectResultEntity; import com.glxp.mipsdl.client.pzh.PzhzdClient; import com.glxp.mipsdl.req.base.*; import com.glxp.mipsdl.req.ctqyy.DlThirdProjectRequest; @@ -356,5 +355,13 @@ public class UdiWmsController { public BaseResponse uploadCollectOrder(@RequestBody PostCollectOrderRequest postCollectOrderRequest) { return ClientProcessor.getHttpClient().uploadCollectOrder(postCollectOrderRequest); } - + /** + * 获取交易类型集合 + * + * @return + */ + @GetMapping("/udiwms/erp/getBuyType") + public BaseResponse getBuyType() { + return ClientProcessor.getHttpClient().getBuyType(); + } }