diff --git a/src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java b/src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java index 512436e..0a48735 100644 --- a/src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java +++ b/src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java @@ -282,6 +282,12 @@ public class PzhzdClient implements BaseHttpClient { UdiwmsInvProductResponse invProductResponse = new UdiwmsInvProductResponse(); invProductResponse.setName(onhandQueryResponse.getCinventory_name()); invProductResponse.setBatchNo(onhandQueryResponse.getVbatchcode()); +// if (StrUtil.isNotEmpty(onhandQueryResponse.getVbatchcode())) { +// String str = onhandQueryResponse.getVbatchcode(); +// String regex = "\\(.*?\\)"; +// str = str.replaceAll(regex, ""); +// invProductResponse.setBatchNo(str); +// } invProductResponse.setCode(onhandQueryResponse.getCinventory_code()); invProductResponse.setCount(onhandQueryResponse.getNnum()); invProductResponse.setSpec(onhandQueryResponse.getInvspec()); @@ -532,6 +538,12 @@ public class PzhzdClient implements BaseHttpClient { subErpOrder.setCount(childrenvoBean.getNinnum()); subErpOrder.setReCount(childrenvoBean.getNshouldinnum()); subErpOrder.setBatchNo(childrenvoBean.getVbatchcode()); + if (StrUtil.isNotEmpty(childrenvoBean.getVbatchcode())) { + String str = childrenvoBean.getVbatchcode(); + String regex = "\\(.*?\\)"; + str = str.replaceAll(regex, ""); + subErpOrder.setBatchNo(str); + } subErpOrder.setPrice(BigDecimal.valueOf(childrenvoBean.getNprice())); subErpOrder.setExpireDate(childrenvoBean.getDvalidate()); subPurchases.add(subErpOrder); @@ -588,6 +600,14 @@ public class PzhzdClient implements BaseHttpClient { subPurchase.setReCount(childrenvoBean.getNshouldoutnum()); subPurchase.setCount(childrenvoBean.getNoutnum()); subPurchase.setBatchNo(childrenvoBean.getVbatchcode()); + + if (StrUtil.isNotEmpty(childrenvoBean.getVbatchcode())) { + String str = childrenvoBean.getVbatchcode(); + String regex = "\\(.*?\\)"; + str = str.replaceAll(regex, ""); + subPurchase.setBatchNo(str); + } + subPurchase.setPrice(BigDecimal.valueOf(childrenvoBean.getNsaleprice())); subPurchases.add(subPurchase); } diff --git a/src/main/java/com/glxp/mipsdl/http/UCloudHttpClient.java b/src/main/java/com/glxp/mipsdl/http/UCloudHttpClient.java index c584d71..a1b6b5a 100644 --- a/src/main/java/com/glxp/mipsdl/http/UCloudHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/http/UCloudHttpClient.java @@ -99,7 +99,7 @@ public class UCloudHttpClient { * @param uSaleoutQueryRequest * @return */ - public UBaseResponse saleoutQuery(USaleoutQueryRequest uSaleoutQueryRequest) { + public UBaseResponse saleoutQuery(USaleoutQueryRequest uSaleoutQueryRequest) { //请求开始时间 Date date = new Date();