From b19cdcc8b0f0c555c717c8cdf07b2c07ed6202ae Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 6 Sep 2022 16:44:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=87=8D=E6=95=B4=EF=BC=8C=E6=8A=BD=E5=87=BA?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mipsdl/admin/aspect/AuthorizeAspect.java | 12 - .../mipsdl/admin/client/http/TestClient.java | 322 +++++++++++++++--- .../mipsdl/admin/client/http/ZaxyyClient.java | 18 +- .../admin/client/http/ZaxyyXmlClient.java | 30 -- .../admin/controller/UdiWmsController.java | 17 +- .../mipsdl/admin/dao/test/TestBusTypeDao.java | 13 + .../mipsdl/admin/dao/test/TestCorpDao.java | 15 + .../admin/dao/test/TestInvWarehouseDao.java | 13 + .../mipsdl/admin/dao/test/TestProductDao.java | 13 + .../dao/test/TestSubInvWarehouseDao.java | 14 + .../admin/dao/thrsys/ThrInvWarehouseDao.java | 2 + .../basic/BussinessOriginTypeEntity.java | 23 ++ .../admin/entity/inout/OrderEntity.java | 13 + .../admin/entity/thrsys/ThrCorpEntity.java | 23 ++ .../entity/thrsys/ThrProductsEntity.java | 46 +++ .../mipsdl/admin/req/TestOrderRequest.java | 63 ++++ .../req/thrsys/FilterThrCorpRequest.java | 14 + .../req/thrsys/FilterThrProductsRequest.java | 29 ++ .../FilterThrSubInvWarehouseRequest.java | 15 + .../com/glxp/mipsdl/admin/util/FileUtils.java | 25 ++ .../glxp/mipsdl/admin/util/PasswordUtils.java | 13 - .../mipsdl/admin/util/PublicFileUtils.java | 23 -- .../mipsdl/admin/util/SubmitOrderUtils.java | 159 +++++++++ .../main/resources/application-pro.properties | 5 +- .../resources/application-test1.properties | 44 +++ .../resources/application-test2.properties | 44 +++ .../mybatis/mapper/inout/OrderDao.xml | 2 - .../mybatis/mapper/test/TestBusTypeDao.xml | 22 ++ .../mybatis/mapper/test/TestCorpDao.xml | 27 ++ .../mapper/test/TestInvWarehouseDao.xml | 42 +++ .../mybatis/mapper/test/TestProductDao.xml | 47 +++ .../mapper/test/TestSubInvWarehouseDao.xml | 27 ++ .../java/com/glxp/mipsdl/admin/JsonTest.java | 8 - 33 files changed, 1033 insertions(+), 150 deletions(-) delete mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyXmlClient.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestBusTypeDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestCorpDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestInvWarehouseDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestProductDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestSubInvWarehouseDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BussinessOriginTypeEntity.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrCorpEntity.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrProductsEntity.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/TestOrderRequest.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/thrsys/FilterThrCorpRequest.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/thrsys/FilterThrProductsRequest.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/thrsys/FilterThrSubInvWarehouseRequest.java delete mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/util/PasswordUtils.java delete mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/util/PublicFileUtils.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/util/SubmitOrderUtils.java create mode 100644 api-sync/src/main/resources/application-test1.properties create mode 100644 api-sync/src/main/resources/application-test2.properties create mode 100644 api-sync/src/main/resources/mybatis/mapper/test/TestBusTypeDao.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/test/TestCorpDao.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/test/TestInvWarehouseDao.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/test/TestProductDao.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/test/TestSubInvWarehouseDao.xml diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/aspect/AuthorizeAspect.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/aspect/AuthorizeAspect.java index b6b2a63..fcc94f2 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/aspect/AuthorizeAspect.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/aspect/AuthorizeAspect.java @@ -54,18 +54,6 @@ public class AuthorizeAspect { if (StrUtil.isBlank(id)) { String apiKey = request.getHeader("api_key"); String secretKey = request.getHeader("secret_key"); - /* AuthLicense authLicense = authLicenseDao.get(apiKey); - if (authLicense != null && authLicense.getSecretKey().equals(secretKey)) { - - } else { - throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL); - }*/ - -// if (StrUtil.isNotBlank(apiKey) && StrUtil.isNotBlank(secretKey) && "ewKD2Cyr".equals(apiKey) && "rO4nDvNWKJ1uNuQQBnECPjnpDv4w6nh8".equals(secretKey)) { -// -// } else { -// throw new JsonException(ResultEnum.AUTH_FAILED); -// } } else { String query = request.getQueryString(); diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java index 223eff8..8e1348a 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java @@ -1,25 +1,54 @@ package com.glxp.mipsdl.admin.client.http; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.glxp.mipsdl.admin.entity.test.TestOrderResponse; +import com.github.pagehelper.PageInfo; +import com.glxp.mipsdl.admin.constant.ConstantStatus; +import com.glxp.mipsdl.admin.constant.ConstantType; +import com.glxp.mipsdl.admin.dao.basic.BussinessTypeDao; +import com.glxp.mipsdl.admin.dao.basic.UdiRelevanceDao; +import com.glxp.mipsdl.admin.dao.business.StockOrderDao; +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.test.*; +import com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity; +import com.glxp.mipsdl.admin.entity.basic.BussinessOriginTypeEntity; +import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.mipsdl.admin.entity.business.StockOrderDetailEntity; +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.thrsys.ThrCorpEntity; +import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.mipsdl.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.mipsdl.admin.entity.thrsys.ThrSubInvWarehouseEntity; import com.glxp.mipsdl.admin.req.*; -import com.glxp.mipsdl.admin.req.phxyy.PhUnitRequest; +import com.glxp.mipsdl.admin.req.phxyy.BussinessOriginTypeFilterRequest; +import com.glxp.mipsdl.admin.req.thrsys.FilterThrCorpRequest; +import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest; +import com.glxp.mipsdl.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.mipsdl.admin.res.system.*; import com.glxp.mipsdl.admin.util.CustomUtil; import com.glxp.mipsdl.admin.util.FileUtils; +import com.glxp.mipsdl.admin.util.SubmitOrderUtils; import com.glxp.mipsdl.common.res.BaseResponse; import com.glxp.mipsdl.common.util.ResultVOUtils; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 测试客户端，用于模拟测试数据 @@ -29,20 +58,55 @@ import java.util.Map; public class TestClient { + @Resource + TestBusTypeDao testBusTypeDao; + @Resource + TestCorpDao testCorpDao; + @Resource + TestInvWarehouseDao testInvWarehouseDao; + @Resource + TestProductDao testProductDao; + @Value("${THIRD_ID}") + private String thirdId; + + + public BaseResponse testConnect() { + return ResultVOUtils.success("连接成功！"); + } + + /** * 查询往来单位信息 * - * @param testUnitRequest * @return */ - public BaseResponse getUnit(PhUnitRequest testUnitRequest) { + public BaseResponse getUnit(UdiwmsUnitRequest udiwmsUnitRequest) { + FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); + BeanUtils.copyProperties(udiwmsUnitRequest, filterThrCorpRequest); + filterThrCorpRequest.setThirdSysFk(udiwmsUnitRequest.getThirdSys()); + List thrCorpEntities = testCorpDao.filterThrCorps(filterThrCorpRequest); - String data = FileUtils.readFileAll("E:\\第三方测试数据\\第三方往来单位测试数据.json"); - BaseResponse> udiDlDeviceResponse = - JSONObject.parseObject(data, new TypeReference>>() { - }); - return udiDlDeviceResponse; + List udiwmsUnitResponses = new ArrayList<>(); + + if (CollUtil.isNotEmpty(thrCorpEntities)) { + for (ThrCorpEntity thrCorpEntity : thrCorpEntities) { + UdiwmsUnitResponse udiwmsUnitResponse = new UdiwmsUnitResponse(); + BeanUtils.copyProperties(thrCorpEntity, udiwmsUnitResponse); + udiwmsUnitResponses.add(udiwmsUnitResponse); + } + } +// String data = FileUtils.readFileAll("E:\\第三方测试数据\\第三方往来单位测试数据.json"); +// BaseResponse> udiDlDeviceResponse = +// JSONObject.parseObject(data, new TypeReference>>() { +// }); + + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiwmsUnitResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiwmsUnitResponses); + return ResultVOUtils.success(pageSimpleResponse); } /** @@ -53,11 +117,29 @@ public class TestClient { */ public BaseResponse getProducuts(UdiwmsProductRequest udiwmsProductRequest) { - String data = FileUtils.readFileAll("E:\\第三方测试数据\\第三方产品信息测试数据.json"); - BaseResponse> udiDlDeviceResponse = - JSONObject.parseObject(data, new TypeReference>>() { - }); - return udiDlDeviceResponse; + + FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); + BeanUtils.copyProperties(udiwmsProductRequest, filterThrProductsRequest); + List thrProductsEntities = testProductDao.filterThrProductsRequest(filterThrProductsRequest); + + List udiwmsProductInfoResponses = new ArrayList<>(); + if (CollUtil.isNotEmpty(thrProductsEntities)) { + for (ThrProductsEntity thrProductsEntity : thrProductsEntities) { + UdiwmsProductInfoResponse udiwmsProductInfoResponse = new UdiwmsProductInfoResponse(); + BeanUtils.copyProperties(thrProductsEntity, udiwmsProductInfoResponse); + udiwmsProductInfoResponses.add(udiwmsProductInfoResponse); + } + } +// String data = FileUtils.readFileAll("E:\\第三方测试数据\\第三方产品信息测试数据.json"); +// BaseResponse> udiDlDeviceResponse = +// JSONObject.parseObject(data, new TypeReference>>() { +// }); + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiwmsProductInfoResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiwmsProductInfoResponses); + return ResultVOUtils.success(pageSimpleResponse); } @@ -102,34 +184,169 @@ public class TestClient { } + //获取单据类型 public BaseResponse getBusType(UdiwmsBusTypeRequest udiwmsBusTypeRequest) { - if (null == udiwmsBusTypeRequest) { return ResultVOUtils.error(500, "参数不能未空"); } - String data = FileUtils.readFileAll("E:\\第三方测试数据\\第三方单据类型测试数据.json"); - BaseResponse> udiDlDeviceResponse = - JSONObject.parseObject(data, new TypeReference>>() { - }); - return udiDlDeviceResponse; + + BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest = new BussinessOriginTypeFilterRequest(); + BeanUtils.copyProperties(udiwmsBusTypeRequest, bussinessOriginTypeFilterRequest); + List bussinessOriginTypeEntities = testBusTypeDao.filterList(bussinessOriginTypeFilterRequest); + + List udiwmsBusTypeResponses = new ArrayList<>(); + if (CollUtil.isNotEmpty(bussinessOriginTypeEntities)) { + for (BussinessOriginTypeEntity bussinessOriginTypeEntity : bussinessOriginTypeEntities) { + UdiwmsBusTypeResponse udiwmsBusTypeResponse = new UdiwmsBusTypeResponse(); + BeanUtils.copyProperties(bussinessOriginTypeEntity, udiwmsBusTypeResponse); + udiwmsBusTypeResponses.add(udiwmsBusTypeResponse); + } + } + +// String data = FileUtils.readFileAll("E:\\第三方测试数据\\第三方单据类型测试数据.json"); +// BaseResponse> udiDlDeviceResponse = +// JSONObject.parseObject(data, new TypeReference>>() { +// }); + + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiwmsBusTypeResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiwmsBusTypeResponses); + return ResultVOUtils.success(pageSimpleResponse); } - /** - * 新增订单 - * - * @param udiwmsOrderRequest - * @return - */ - public BaseResponse addOrders(UdiwmsOrderRequest udiwmsOrderRequest) { -// Map verifyResult = verifyOrderParams(udiwmsOrderRequest); -// boolean flag = (boolean) verifyResult.get("flag"); -// if (!flag) { -// return ResultVOUtils.error(500, verifyResult.get("msg").toString()); -// } - TestOrderResponse udiwmsOrderResponse = new TestOrderResponse(); - udiwmsOrderResponse.setThirdBillNo(CustomUtil.getId()); - return ResultVOUtils.success(udiwmsOrderResponse); + + @Resource + SubmitOrderUtils submitOrderUtils; + @Resource + private StockOrderDao stockOrderDao; + @Resource + private StockOrderDetailDao stockOrderDetailDao; + @Resource + private OrderDao orderDao; + @Resource + private BussinessTypeDao bussinessTypeDao; + @Resource + private CodesDao codesDao; + @Resource + private UdiRelevanceDao udiRelevanceDao; + @Resource + private StockOrderUploadLogDao stockOrderUploadLogDao; + + public BaseResponse addOrders(TestOrderRequest orderRequest) { + if (StrUtil.isEmpty(orderRequest.getId())) { + return ResultVOUtils.error(500, "单据ID不能为空！"); + } + StockOrderEntity stockOrderEntity = stockOrderDao.findById(orderRequest.getId()); + OrderEntity orderEntity = orderDao.findById(stockOrderEntity.getOrderIdFk()); + List stockOrderDetailEntities = stockOrderDetailDao.findByOrderIdFk(stockOrderEntity.getId()); + BussinessLocalTypeEntity bussinessLocalTypeEntity = submitOrderUtils.getCurLocType(stockOrderEntity.getBillType()); + orderRequest.setBillDate(stockOrderEntity.getBilldate()); + orderRequest.setBillNo(stockOrderEntity.getBillNo()); + orderRequest.setBillType(submitOrderUtils.toBusType(stockOrderEntity.getBillType())); + + if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) { + orderRequest.setCorpId(stockOrderEntity.getCorpName()); + orderRequest.setCorpName(stockOrderEntity.getCorpName()); + } else if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INNOR) { + ThrInvWarehouseEntity thrInvWarehouseEntity = submitOrderUtils.toInv(stockOrderEntity.getInvWarehouseCode(), thirdId); + orderRequest.setCorpId(thrInvWarehouseEntity.getCode()); + orderRequest.setCorpName(thrInvWarehouseEntity.getName()); + } else if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { + ThrCorpEntity thrCorpEntity = submitOrderUtils.toCorp(stockOrderEntity.getCorpId(), thirdId); + orderRequest.setCorpId(thrCorpEntity.getUnitId()); //往来单位编码，需转换为第三方系统的ID + orderRequest.setCorpName(thrCorpEntity.getName()); //往来单位名称，需转换为第三方系统的名称 + } + ThrInvWarehouseEntity thrInvWarehouseEntity = submitOrderUtils.toInv(stockOrderEntity.getLocStorageCode(), thirdId); + orderRequest.setLocInvCode(thrInvWarehouseEntity.getCode()); + orderRequest.setLocInvName(thrInvWarehouseEntity.getName()); + ThrSubInvWarehouseEntity thrSubInvWarehouseEntity = submitOrderUtils.toSubInv(stockOrderEntity.getInvWarehouseCode(), thirdId); + orderRequest.setLocSubInvCode(thrSubInvWarehouseEntity.getCode()); + orderRequest.setLocSubInvName(thrSubInvWarehouseEntity.getName()); + String mainAction = bussinessTypeDao.selectInoutTypebByLocalAction(stockOrderEntity.getBillType()); + if (ConstantType.TYPE_PUT.equals(mainAction)) { + orderRequest.setInoutType(1); //出入库类型：入库 + } else if (ConstantType.TYPE_OUT.equals(mainAction)) { + orderRequest.setInoutType(2); //出入库类型：出库 + } + orderRequest.setRemark("udi管理系统提交单据"); //备注 + + + List warehouseEntities = codesDao.findByReceiptId(stockOrderEntity.getOrderIdFk()); + List items = new ArrayList<>(stockOrderDetailEntities.size()); + for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectById(stockOrderDetailEntity.getRelId()); + UdiwmsOrderDetail item = new UdiwmsOrderDetail(); + BeanUtil.copyProperties(stockOrderDetailEntity, item); + if (StrUtil.isNotEmpty(stockOrderDetailEntity.getProductDate())) { + item.setProductDate(com.glxp.mipsdl.admin.util.DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getProductDate())); + } + if (StrUtil.isNotEmpty(stockOrderDetailEntity.getExpireDate())) { + item.setExpireDate(com.glxp.mipsdl.admin.util.DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getExpireDate())); + } + 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()); + item.setCodeList(submitOrderUtils.getCodeArray(stockOrderDetailEntity, warehouseEntities)); + ThrProductsEntity thrProductsEntity = submitOrderUtils.toProduct(stockOrderDetailEntity, thirdId); + item.setProductId(thrProductsEntity.getCode()); + item.setProductName(thrProductsEntity.getName()); + items.add(item); + } + orderRequest.setItem(items); + //记录日志 + StockOrderUploadLogEntity uploadLog = new StockOrderUploadLogEntity(); + uploadLog.setBillDate(com.glxp.mipsdl.admin.util.DateUtil.parseDate(orderRequest.getBillDate())); + uploadLog.setBillType(stockOrderEntity.getBillType()); + uploadLog.setSubmitTime(new Date()); + uploadLog.setBillNo(orderRequest.getBillNo()); + uploadLog.setFromType(ConstantStatus.THIRD_ORDER_UPLOAD); + String data = JSONUtil.toJsonStr(orderRequest); + FileUtils.saveFileAs(data, thirdId + "_" + stockOrderEntity.getBillNo()); + String response = "上传成功！"; + if (StrUtil.isNotBlank(response)) { + try { + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + if (baseResponse.getCode().equals(20000)) { + String thirdBillNo = String.valueOf(baseResponse.getData()); + orderEntity.setExportStatus(1); + orderEntity.setThirdBillNo(thirdBillNo); + uploadLog.setStatus(2); + uploadLog.setThrBillNo(thirdBillNo); + uploadLog.setResult("提交成功"); + stockOrderUploadLogDao.insert(uploadLog); + orderDao.updateOrder(orderEntity); + return ResultVOUtils.success("提交成功"); + } + uploadLog.setStatus(3); + uploadLog.setResult("提交失败，错误信息：" + baseResponse.getMessage()); + stockOrderUploadLogDao.insert(uploadLog); + return baseResponse; + } catch (Exception e) { + log.error(e.getMessage(), e); + uploadLog.setStatus(3); + uploadLog.setResult("提交失败，错误信息：" + response); + stockOrderUploadLogDao.insert(uploadLog); + return ResultVOUtils.error(500, "提交失败"); + } + } else { + uploadLog.setStatus(3); + uploadLog.setResult("提交失败，调用接口返回为空"); + stockOrderUploadLogDao.insert(uploadLog); + return ResultVOUtils.error(500, "提交失败"); + } + + } /** @@ -221,7 +438,33 @@ public class TestClient { return ResultVOUtils.success(list); } + //获取仓库 public BaseResponse getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) { + List udiwmsWarehouseResponses = new ArrayList<>(); + FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest(); + BeanUtils.copyProperties(udiwmsWarehouseRequest, filterThrInvWarehouseRequest); + List thrInvWarehouseEntities = testInvWarehouseDao.filterThrInvWarehouse(filterThrInvWarehouseRequest); + if (CollUtil.isNotEmpty(thrInvWarehouseEntities)) { + for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) { + UdiwmsWarehouseResponse udiwmsWarehouseResponse = new UdiwmsWarehouseResponse(); + BeanUtils.copyProperties(thrInvWarehouseEntity, udiwmsWarehouseResponse); + udiwmsWarehouseResponses.add(udiwmsWarehouseResponse); + } + } +// String data = FileUtils.readFileAll("E:\\第三方测试数据\\第三方仓库字段测试数据.json"); +// BaseResponse> udiDlDeviceResponse = +// JSONObject.parseObject(data, new TypeReference>>() { +// }); + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiwmsWarehouseResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiwmsWarehouseResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + //获取分库 + public BaseResponse getSubWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) { if (null == udiwmsWarehouseRequest || StrUtil.isBlank(udiwmsWarehouseRequest.getThirdSys())) { return ResultVOUtils.error(500, "第三方系统ID不能为空"); } @@ -231,4 +474,5 @@ public class TestClient { }); return udiDlDeviceResponse; } + } 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 136b220..965a1ba 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 @@ -23,7 +23,10 @@ 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.basic.BasicThirdSysBusApiEntity; +import com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity; +import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.mipsdl.admin.entity.basic.UnitMaintainEntity; import com.glxp.mipsdl.admin.entity.business.StockOrderDetailEntity; import com.glxp.mipsdl.admin.entity.business.StockOrderEntity; import com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity; @@ -218,20 +221,10 @@ public class ZaxyyClient { public BaseResponse getOrders(UdiwmsOrderRequest udiwmsOrderRequest) { -// if (StrUtil.isEmpty(udiwmsOrderRequest.getBillType())) { -// return ResultVOUtils.error(500, "单据类型不能未空"); -// } -// if (StrUtil.isEmpty(udiwmsOrderRequest.getThirdSys())) { -// return ResultVOUtils.error(500, "第三方系统ID不能为空"); -// } -// BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.findByKey(udiwmsOrderRequest.getBillType(), thirdSysConfig.getThirdSysConfig().getThirdId()); -// udiwmsOrderRequest.setBillType(bussinessOriginTypeResponse.getThirdAction()); - ZaZyHeareRequest zaZyHeareRequest = new ZaZyHeareRequest(); zaZyHeareRequest.setMsgHeader(getMsgHeader("getMaterialApply")); zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsOrderRequest)); -// BasicThirdSysBusApiEntity basicThirdSysBusApiEntity = basicThirdSysBusApiService.selectByKey(bussinessOriginTypeResponse.getThirdAction(), bussinessOriginTypeResponse.getThirdSys(), 1); BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("orderQueryUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), zaZyHeareRequest, getHeaderArray()); response = parseErrorMsg(response); @@ -255,9 +248,6 @@ public class ZaxyyClient { OrderEntity orderEntity = orderDao.findById(stockOrderEntity.getOrderIdFk()); List stockOrderDetailEntities = stockOrderDetailDao.findByOrderIdFk(stockOrderEntity.getId()); - - BussinessTypeEntity bussinessTypeEntity = bussinessTypeDao.selectByAction(orderEntity.getAction()); - udiwmsOrderRequest.setBillDate(stockOrderEntity.getBilldate()); udiwmsOrderRequest.setBillNo(stockOrderEntity.getBillNo()); diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyXmlClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyXmlClient.java deleted file mode 100644 index 084cac6..0000000 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyXmlClient.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.glxp.mipsdl.admin.client.http; - -import com.glxp.mipsdl.common.res.BaseResponse; -import com.glxp.mipsdl.common.util.ResultVOUtils; -import org.apache.cxf.endpoint.Client; -import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory; -import org.springframework.stereotype.Service; - -@Service -public class ZaxyyXmlClient { - - public BaseResponse testWebservice() { - JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance(); - Client client = dcf.createClient("http://192.168.8.41:8081/ZoesoftHipService.asmx"); - // 设置出口拦截器，拦截器实现 org.apache.cxf.interceptor.Interceptor 接口即可 -// client.getOutInterceptors().add(new CustomInterceptor()); - - String head ="getMasterialInput"; - Object[] objects; - try { - objects = client.invoke("getMasterialInput", "{\"billNo\":\"ZY202205070001\",\"billdate\":\"2022-05-07\",\"corpId\":\"65119908299161\",\"corpName\":\"福建片仔癀诊断技术有限公司\",\"billType\":\"采购入库\",\"billFlag\":\"1\",\"thirdSys\":\"thirdId\",\"locInvCode\":\"11001\",\"locInvName\":\"总仓库\",\"inoutType\":\"1\",\"remark\":\"\",\"item\":[{\"billNo\":\"ZY202205070001\",\"productId\":\"7864\",\"productName\":\"通用脊柱内固定器-6.0 连接棒\",\"standard\":\"70-450mm/理贝尔\",\"expireDate\":\"2025-01-03\",\"productDate\":\"2021-03-01\",\"batchNo\":\"202003\",\"count\":10,\"measname\":\"计量单位\",\"registerNo\":\"国食药监械（准）字 2006 第 3460057 号\",\"price\":10.0,\"secSalesInvNo\":\"21232424\",\"invoiceDate\":\"2323243\",\"secSalesListNo\":\"42342\",\"firstSalesInvNo\":\"423424\",\"remark\":\"\",\"remakr1\":\"\",\"remakr2\":\"\",\"codeList\":[{\"code\":\"01069125473843801121041410210290075\",\"nameCode\":\"06912547384380\",\"count\":1}]},{\"productId\":\"7901\",\"productName\":\"亲水性丙烯酸折叠式人工晶状体 Hydrophilic AcrylicFoldableIntraocular Lens\",\"standard\":\"S1AW00\",\"batchNo\":\"202103\",\"expireDate\":\"2025-01-03\",\"productDate\":\"2021-03-01\",\"count\":10,\"measname\":\"计量单位\",\"registerNo\":\"国械注进 20153162635\",\"price\":10.0,\"secSalesInvNo\":\"21232424\",\"invoiceDate\":\"2323243\",\"secSalesListNo\":\"42342\",\"firstSalesInvNo\":\"423424\",\"remark\":\"\",\"remakr1\":\"\",\"remakr2\":\"\",\"codeList\":[{\"code\":\"01069125473843801121041410210290075\",\"nameCode\":\"06912547384380\",\"count\":1}]}]}"); - System.out.println("响应 : " + objects[0]); - } catch (java.lang.Exception e) { - e.printStackTrace(); - } - return ResultVOUtils.error(500, "失败"); - } - - -} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java index be4eba6..ab97408 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java @@ -9,6 +9,7 @@ import com.glxp.mipsdl.admin.req.phxyy.*; import com.glxp.mipsdl.common.enums.ResultEnum; import com.glxp.mipsdl.common.res.BaseResponse; import com.glxp.mipsdl.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -25,7 +26,7 @@ public class UdiWmsController { private String curFlag; @Resource YyUCloud31Client pzhzdClient; - @Resource + @Autowired private TestClient testClient; @Resource private UdPlatClient udPlatClient; @@ -45,9 +46,7 @@ public class UdiWmsController { if (curFlag.equals("YONGYOU_U8_V3.1")) { return pzhzdClient.getUnit(testUnitRequest); } else if (curFlag.equals("TEST")) { - PhUnitRequest phUnitRequest = new PhUnitRequest(); - BeanUtil.copyProperties(testUnitRequest, phUnitRequest); - return testClient.getUnit(phUnitRequest); + return testClient.getUnit(testUnitRequest); } else if (curFlag.equals("PHXYY")) { PhUnitRequest phUnitRequest = new PhUnitRequest(); BeanUtil.copyProperties(testUnitRequest, phUnitRequest); @@ -148,7 +147,9 @@ public class UdiWmsController { @PostMapping("/udiwms/erp/submitOrders") public BaseResponse submitOrders(@RequestBody UdiwmsOrderRequest udiwmsOrderRequest) { if (curFlag.equals("TEST")) { - return testClient.addOrders(udiwmsOrderRequest); + TestOrderRequest testOrderRequest = new TestOrderRequest(); + BeanUtil.copyProperties(udiwmsOrderRequest, testOrderRequest); + return testClient.addOrders(testOrderRequest); } else if (curFlag.equals("PHXYY")) { PhOrderRequest phOrderRequest = new PhOrderRequest(); BeanUtil.copyProperties(udiwmsOrderRequest, phOrderRequest); @@ -178,7 +179,9 @@ public class UdiWmsController { @PostMapping("/udiwms/erp/addOrders") public BaseResponse addOrders(@RequestBody UdiwmsOrderRequest udiwmsOrderRequest) { if (curFlag.equals("TEST")) { - return testClient.addOrders(udiwmsOrderRequest); + TestOrderRequest testOrderRequest = new TestOrderRequest(); + BeanUtil.copyProperties(udiwmsOrderRequest, testOrderRequest); + return testClient.addOrders(testOrderRequest); } return ResultVOUtils.error(500, "未设置系统版本"); } @@ -260,7 +263,7 @@ public class UdiWmsController { @PostMapping("/udiwms/erp/testThirdSys") public BaseResponse testThirdSys() { if (curFlag.equals("TEST")) { - return ResultVOUtils.success("连接成功！"); + return testClient.testConnect(); } else if (curFlag.equals("PHXYY")) { return phxyyClient.testConnect(); } else if (curFlag.equals("ZAXZYY")) { diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestBusTypeDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestBusTypeDao.java new file mode 100644 index 0000000..aa3f7b2 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestBusTypeDao.java @@ -0,0 +1,13 @@ +package com.glxp.mipsdl.admin.dao.test; + +import com.glxp.mipsdl.admin.entity.basic.BussinessOriginTypeEntity; +import com.glxp.mipsdl.admin.req.phxyy.BussinessOriginTypeFilterRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface TestBusTypeDao { + List filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest); + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestCorpDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestCorpDao.java new file mode 100644 index 0000000..c052cae --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestCorpDao.java @@ -0,0 +1,15 @@ +package com.glxp.mipsdl.admin.dao.test; + +import com.glxp.mipsdl.admin.entity.thrsys.ThrCorpEntity; +import com.glxp.mipsdl.admin.req.thrsys.FilterThrCorpRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface TestCorpDao { + + List filterThrCorps(FilterThrCorpRequest filterThrCorpRequest); + + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestInvWarehouseDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestInvWarehouseDao.java new file mode 100644 index 0000000..19b9d7b --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestInvWarehouseDao.java @@ -0,0 +1,13 @@ +package com.glxp.mipsdl.admin.dao.test; + +import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface TestInvWarehouseDao { + + List filterThrInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest); +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestProductDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestProductDao.java new file mode 100644 index 0000000..0abeba4 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestProductDao.java @@ -0,0 +1,13 @@ +package com.glxp.mipsdl.admin.dao.test; + +import com.glxp.mipsdl.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.mipsdl.admin.req.thrsys.FilterThrProductsRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface TestProductDao { + + List filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest); +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestSubInvWarehouseDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestSubInvWarehouseDao.java new file mode 100644 index 0000000..95a6ee8 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestSubInvWarehouseDao.java @@ -0,0 +1,14 @@ +package com.glxp.mipsdl.admin.dao.test; + +import com.glxp.mipsdl.admin.entity.thrsys.ThrSubInvWarehouseEntity; +import com.glxp.mipsdl.admin.req.thrsys.FilterThrSubInvWarehouseRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface TestSubInvWarehouseDao { + + List filterThrInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest); + +} 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 63837f1..195512e 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 @@ -10,7 +10,9 @@ import java.util.List; @Mapper public interface ThrInvWarehouseDao { + List filterThrInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest); ThrInvWarehouseEntity selectByCode(@Param("code") String code, @Param("thirdSysFk") String thirdSysFk); + } diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BussinessOriginTypeEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BussinessOriginTypeEntity.java new file mode 100644 index 0000000..9a3e626 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BussinessOriginTypeEntity.java @@ -0,0 +1,23 @@ +package com.glxp.mipsdl.admin.entity.basic; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import java.util.Date; + +@Data +public class BussinessOriginTypeEntity { + private String id; + private String name; + private String action; + + @NotEmpty(message = "第三方系统不能为空！") + private String thirdSys; + private String thirdSysName; + private Boolean enable; + private String remark; + private String mainAction; + private Date updateTime; + private Integer inoutType; + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inout/OrderEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inout/OrderEntity.java index d8f8140..04fde21 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inout/OrderEntity.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inout/OrderEntity.java @@ -19,6 +19,8 @@ public class OrderEntity { private Integer status; private Integer fromType; + + private Integer originFromType; private Integer contrastStatus; private String erpFk; private Integer signStatus; @@ -63,4 +65,15 @@ public class OrderEntity { private String billTypeName; private String subInvName; private String invName; + + + private String deptCode; + private String deptName; + + private String printRemark; + + /** + * 采集UDI码时进行三期校验 + */ + private boolean codeFillCheck; } diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrCorpEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrCorpEntity.java new file mode 100644 index 0000000..7646f03 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrCorpEntity.java @@ -0,0 +1,23 @@ +package com.glxp.mipsdl.admin.entity.thrsys; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrCorpEntity { + + private String id; + private String unitId; + private String name; + private String spell; + private String addr; + private String creditNo; + private String contact; + private String mobile; + private String thirdSysFk; + private Boolean checked; + private Date updateTime; + + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrProductsEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrProductsEntity.java new file mode 100644 index 0000000..fa298c4 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrProductsEntity.java @@ -0,0 +1,46 @@ +package com.glxp.mipsdl.admin.entity.thrsys; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrProductsEntity { + private Integer id; + private String code; + private String name; + private String measname; + private String spec; + private String registerNo; + private String manufactory; + private String thirdSysFk; + private String thirdSys; + private String cplb; + private String flbm; + private String qxlb; + private String ybbm; + private String sptm; + private String tyshxydm; + private String zczbhhzbapzbh; + private String ylqxzcrbarmc; + private String ylqxzcrbarywmc; + private String cpms; + private Date updateTime; + private String supName; + private String thirdSysName; + + private boolean isChecked; + + //添加字段 + private String model; //型号 + private String standard; //规格型号，二合一字段 + private String qtbm; //其他编码 + private String zczyxqz; //注册有效期截止时间 + private String price; + private String remark; //备注 + private String remark1; //备注1 + private String remark2; //备注2 + private String remark3; //备注3 + + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/TestOrderRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/TestOrderRequest.java new file mode 100644 index 0000000..7200ef9 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/TestOrderRequest.java @@ -0,0 +1,63 @@ +package com.glxp.mipsdl.admin.req; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +@Data +public class TestOrderRequest { + + private String billNo; //单据号 + private String billFlag; //单据状态,0.未签字，1.已签字 + private Integer inoutType; //出入库类型 1.入库 2.出库 + private String billDate; //单据日期 + private String billType; //单据类型 + private String remark; //备注 + private String corpId; //第三方单据往来单位ID + private String corpName; //往来单位 + private String locInvCode; + private String locInvName; + private String locSubInvCode; + private String locSubInvName; + private String thirdSys; + private String actor; + + private String id; + private String thirdSysFk; + private String status; + private String statusInfo; + private String type; + private String sourceType; + private String printStatus; + private String unitIdFk; + private String customerId; + private String thirdOrderFk; + private String orderIdFk; + private BigDecimal totalPrice; + private String locStorageCode; + private String locStorageName; + private String invWarehouseCode; + private String fromSubInvCode; + private String fromSubInvName; + //补单单号 + private String supplementNo; + + private Integer createUser; + private Integer reviewUser; + + //审核时间 + private Date auditTime; + //更新时间 + private Date updateTime; + //委托验收已完成 + private boolean entrustEnd; + + + private String billTypeName; + private String subInvName; + private String invName; + private List item; //单据详情数组 + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/thrsys/FilterThrCorpRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/thrsys/FilterThrCorpRequest.java new file mode 100644 index 0000000..8e0fd89 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/thrsys/FilterThrCorpRequest.java @@ -0,0 +1,14 @@ +package com.glxp.mipsdl.admin.req.thrsys; + +import com.glxp.mipsdl.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterThrCorpRequest extends ListPageRequest { + private String thirdSysFk; + private String thirdSys; + private String unitId; + private String name; + private String lastUpdateTime; + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/thrsys/FilterThrProductsRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/thrsys/FilterThrProductsRequest.java new file mode 100644 index 0000000..d0bac27 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/thrsys/FilterThrProductsRequest.java @@ -0,0 +1,29 @@ +package com.glxp.mipsdl.admin.req.thrsys; + +import com.glxp.mipsdl.admin.req.ListPageRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class FilterThrProductsRequest extends ListPageRequest { + private String code; + private String name; + private String spec; //规格型号 + private String registerNo; //注册证号 + private String manufactory; //生产厂家 + private String thirdSys; + private String thirdSysFk; + private String unionCode; + private String sptm; + private String ybbm; + private String supName; + private String lastUpdateTime; + + + private List codes; + private Integer checkStatus; + private String customerId; + private String supId; + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/thrsys/FilterThrSubInvWarehouseRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/thrsys/FilterThrSubInvWarehouseRequest.java new file mode 100644 index 0000000..7b55614 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/thrsys/FilterThrSubInvWarehouseRequest.java @@ -0,0 +1,15 @@ +package com.glxp.mipsdl.admin.req.thrsys; + +import com.glxp.mipsdl.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterThrSubInvWarehouseRequest extends ListPageRequest { + + private String id; + private String code; + private String name; + private String parentId; + private String thirdSysFk; + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/util/FileUtils.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/util/FileUtils.java index 41b5068..4079f18 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/util/FileUtils.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/util/FileUtils.java @@ -61,4 +61,29 @@ public class FileUtils { return ""; } } + + + public static boolean saveFileAs(String content, String path) { + FileWriter fw = null; + try { + fw = new FileWriter(new File(path), false); + if (content != null) { + fw.write(content); + } + } catch (IOException e) { + e.printStackTrace(); + return false; + } finally { + if (fw != null) { + try { + fw.flush(); + fw.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return true; + } + } diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/util/PasswordUtils.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/util/PasswordUtils.java deleted file mode 100644 index 5eed85b..0000000 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/util/PasswordUtils.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.glxp.mipsdl.admin.util; - -/** - * 密码相关的工具类 - */ -public class PasswordUtils { - - public static String authAdminPwd(String pwd) { -// return DigestUtils.md5DigestAsHex(DigestUtils.md5DigestAsHex(pwd.getBytes()).getBytes()).toLowerCase(); - return pwd; - } - -} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/util/PublicFileUtils.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/util/PublicFileUtils.java deleted file mode 100644 index 898eda8..0000000 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/util/PublicFileUtils.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.glxp.mipsdl.admin.util; - -import com.glxp.mipsdl.admin.config.PublicFileUrlConfig; - -/** - * 公共文件管理工具 - */ -public class PublicFileUtils { - - public static String createUploadUrl(String filePath) { - - if (filePath == null || filePath.isEmpty()) { - return ""; - } - - if (filePath.indexOf("http") == 0 || filePath.indexOf("/") == 0) { - return filePath; - } - - return PublicFileUrlConfig.getDomain() + "/" + filePath; - } - -} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/util/SubmitOrderUtils.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/util/SubmitOrderUtils.java new file mode 100644 index 0000000..3b3c6e0 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/util/SubmitOrderUtils.java @@ -0,0 +1,159 @@ +package com.glxp.mipsdl.admin.util; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.util.StrUtil; +import com.glxp.mipsdl.admin.dao.basic.BasicThirdSysBusApiDao; +import com.glxp.mipsdl.admin.dao.basic.BussinessLocalTypeDao; +import com.glxp.mipsdl.admin.dao.basic.UdiRelevanceDao; +import com.glxp.mipsdl.admin.dao.basic.UnitMaintainDao; +import com.glxp.mipsdl.admin.dao.inventory.InvSubWarehouseDao; +import com.glxp.mipsdl.admin.dao.inventory.InvWarehouseDao; +import com.glxp.mipsdl.admin.dao.thrsys.ThrInvWarehouseDao; +import com.glxp.mipsdl.admin.dao.thrsys.ThrSubInvWarehouseDao; +import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity; +import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.mipsdl.admin.entity.basic.UnitMaintainEntity; +import com.glxp.mipsdl.admin.entity.business.StockOrderDetailEntity; +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.thrsys.ThrCorpEntity; +import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.mipsdl.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.mipsdl.admin.entity.thrsys.ThrSubInvWarehouseEntity; +import com.glxp.mipsdl.admin.req.UdiwmsOrderDetail; +import com.glxp.mipsdl.admin.req.basic.BussinessLocalTypeFilterRequest; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +@Slf4j +@Service +public class SubmitOrderUtils { + + @Resource + UnitMaintainDao unitMaintainDao; + @Resource + private InvWarehouseDao invWarehouseDao; + @Resource + private ThrInvWarehouseDao thrInvWarehouseDao; + @Resource + private InvSubWarehouseDao invSubWarehouseDao; + @Resource + private ThrSubInvWarehouseDao thrSubInvWarehouseDao; + @Resource + private UdiRelevanceDao udiRelevanceDao; + @Resource + private BasicThirdSysBusApiDao thirdSysBusApiDao; + @Resource + private BussinessLocalTypeDao bussinessLocalTypeDao; + + + //获取当前对应单据类型 + public BussinessLocalTypeEntity getCurLocType(String billType) { + BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest(); + bussinessLocalTypeFilterRequest.setAction(billType); + List bussinessLocalTypeEntities = bussinessLocalTypeDao.filterJoin(bussinessLocalTypeFilterRequest); + BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeEntities.get(0); + return bussinessLocalTypeEntity; + } + + //转换第三方往来单位 + public ThrCorpEntity toCorp(String corpId, String thirdId) { + ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); + UnitMaintainEntity unitMaintainEntity = unitMaintainDao.selectThirdInfoByErpId(corpId); + try { + String thirdCorpId = (String) ReflectUtil.getFieldValue(unitMaintainEntity, unitMaintainEntity.getClass().getField(thirdId)); + thrCorpEntity.setUnitId(thirdCorpId); //往来单位编码，需转换为第三方系统的ID + String thirdName = ThirdUtils.getThirdName(thirdId); + String thirdCorpName = (String) ReflectUtil.getFieldValue(unitMaintainEntity, unitMaintainEntity.getClass().getField(thirdName)); + thrCorpEntity.setName(thirdCorpName); //往来单位名称，需转换为第三方系统的名称 + return thrCorpEntity; + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return thrCorpEntity; + } + + //转换第三方仓库信息 + public ThrInvWarehouseEntity toInv(String invCode, String thirdId) { + InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOneByCode(invCode); + try { + String thrInvCode = (String) ReflectUtil.getFieldValue(invWarehouseEntity, invWarehouseEntity.getClass().getField(thirdId)); + ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(thrInvCode, thirdId); + return thrInvWarehouseEntity; + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + return null; + } + + //转换第三方分库信息 + public ThrSubInvWarehouseEntity toSubInv(String invCode, String thirdId) { + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseDao.selectOneByCode(invCode); + try { + String thrInvCode = (String) ReflectUtil.getFieldValue(invSubWarehouseEntity, invSubWarehouseEntity.getClass().getField(thirdId)); + ThrSubInvWarehouseEntity thrSubInvWarehouseEntity = thrSubInvWarehouseDao.selectByCode(thrInvCode, thirdId); + return thrSubInvWarehouseEntity; + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + return null; + } + + //转换第三方产品信息 + public ThrProductsEntity toProduct(StockOrderDetailEntity stockOrderDetailEntity, String thirdId) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectById(stockOrderDetailEntity.getRelId()); + String thirdProductId = (String) ReflectUtil.getFieldValue(udiRelevanceEntity, thirdId); + String thirdName = ThirdUtils.getThirdName(thirdId); + String thirdProductName = (String) ReflectUtil.getFieldValue(udiRelevanceEntity, thirdName); + ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); + thrProductsEntity.setCode(thirdProductId); + thrProductsEntity.setName(thirdProductName); + return thrProductsEntity; + } + + //获取单据对应条码信息 + public List getCodeArray(StockOrderDetailEntity stockOrderDetailEntity, List warehouseEntities) { + List warehouseEntityList = filterCodes(stockOrderDetailEntity, warehouseEntities); + if (CollUtil.isNotEmpty(warehouseEntityList)) { + List codeDetaiEntities = new ArrayList<>(); + warehouseEntityList.forEach(warehouseEntity -> { + UdiwmsOrderDetail.CodeDetaiEntity codeDetaiEntity = new UdiwmsOrderDetail.CodeDetaiEntity(); + BeanUtils.copyProperties(warehouseEntity, codeDetaiEntity); + codeDetaiEntities.add(codeDetaiEntity); + }); + return codeDetaiEntities; + } else return null; + } + + //转换第三方单据类型 + public String toBusType(String billType) { + BasicThirdSysBusApiEntity thirdSysBusApiEntity = thirdSysBusApiDao.selectByCode(billType); + if (thirdSysBusApiEntity != null) { + return thirdSysBusApiEntity.getThirdBuyCode(); + } + return null; + } + + public List filterCodes(StockOrderDetailEntity stockOrderDetailEntity, List warehouseEntities) { + List results = new ArrayList<>(); + if (CollUtil.isNotEmpty(warehouseEntities)) { + for (WarehouseEntity warehouseEntity : warehouseEntities) { + if (StrUtil.trimToEmpty(warehouseEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId())) + && StrUtil.trimToEmpty(warehouseEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo())) + ) { + results.add(warehouseEntity); + } + } + } + return results; + } + +} diff --git a/api-sync/src/main/resources/application-pro.properties b/api-sync/src/main/resources/application-pro.properties index 40cb1f1..9902d7a 100644 --- a/api-sync/src/main/resources/application-pro.properties +++ b/api-sync/src/main/resources/application-pro.properties @@ -2,6 +2,7 @@ server.port=9997 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver #spring.datasource.jdbc-url=jdbc:mysql://192.168.235.137:33306/udiwms_erp?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +#spring.datasource.jdbc-url=jdbc:mysql://192.168.0.148:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root spring.datasource.password=123456 @@ -23,7 +24,7 @@ server.connectionTimeout=180000 #U8参数 #udi管理系统IP地址（上传文件解析后回传） UDIWMS_IP=http://127.0.0.1:9991 -#UDIWMS_IP=http://192.168.0.66:8500/UDI_WMS_MC +#UDIWMS_IP=http://192.168.0.148:3306/UDI_WMS_MC API_KEY=1102 API_SECRET=4dc07484afd34e8083ba96e8fe564224 #文件导入 @@ -32,7 +33,7 @@ FILE_VERSION_FLAG=ZHIYE_V1 #接口实时获取 #0.NULL(空，未配置）,1.YONGYOU_U8_V3.1(用友3.1版本，片仔癀诊断） 2.YG_UDPLAT_V1.0(阳光采购平台) 3.TEST(标准接口，测试用),4.PHXYY(平和县医院) #5.ZAXZYY(诏安县医院) -ONLINE_VESRION_FLAG=ZAXZYY +ONLINE_VESRION_FLAG=TEST THIRD_ID=thirdId ok.http.connect-timeout=3000 ok.http.read-timeout=3000 diff --git a/api-sync/src/main/resources/application-test1.properties b/api-sync/src/main/resources/application-test1.properties new file mode 100644 index 0000000..510397b --- /dev/null +++ b/api-sync/src/main/resources/application-test1.properties @@ -0,0 +1,44 @@ +# 本地环境 +server.port=9997 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#spring.datasource.jdbc-url=jdbc:mysql://192.168.235.137:33306/udiwms_erp?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.username=root +spring.datasource.password=123456 +#spring.datasource.password=89083fb2fc145533 +logging.level.com.glxp.mipsdl.admin.dao=debug +#logging.level.com.glxp.mipsdl.admin.barcode=debug +# 跨域设置 +cors.allowed-origins=* +cors.allowed-headers=Content-Type,ADMIN_ID,ADMIN_TOKEN +cors.allowed-methods=GET,POST,OPTIONS +server.servlet.context-path= +#请求参数长度 +server.tomcat.max-http-form-post-size=100MB +server.max-http-header-size=100MB +#最大上传文件大小(10MB) +spring.servlet.multipart.max-file-size=200MB +spring.servlet.multipart.max-request-size=200MB +server.connectionTimeout=180000 +#U8参数 +#udi管理系统IP地址（上传文件解析后回传） +#UDIWMS_IP=http://127.0.0.1:9991 +UDIWMS_IP=http://192.168.0.66:8500/UDI_WMS_MC +API_KEY=1102 +API_SECRET=4dc07484afd34e8083ba96e8fe564224 +#文件导入 +#0.NULL(空，未配置），1.GLXP(自定义规范标准），2.ZHIYE_V1(智业V1,诏安医院),3.YG_UDPLAT_V1(阳光采购平台）,4.PHXYY(平和县医院) +FILE_VERSION_FLAG=ZHIYE_V1 +#接口实时获取 +#0.NULL(空，未配置）,1.YONGYOU_U8_V3.1(用友3.1版本，片仔癀诊断） 2.YG_UDPLAT_V1.0(阳光采购平台) 3.TEST(标准接口，测试用),4.PHXYY(平和县医院) +#5.ZAXZYY(诏安县医院) +ONLINE_VESRION_FLAG=ZAXZYY +THIRD_ID=thirdId +ok.http.connect-timeout=3000 +ok.http.read-timeout=3000 +ok.http.write-timeout=3000 +# 连接池中整体的空闲连接的最大数量 +ok.http.max-idle-connections=200 +# 连接空闲时间最多为 300 秒 +ok.http.keep-alive-duration=300 + diff --git a/api-sync/src/main/resources/application-test2.properties b/api-sync/src/main/resources/application-test2.properties new file mode 100644 index 0000000..e21c2f8 --- /dev/null +++ b/api-sync/src/main/resources/application-test2.properties @@ -0,0 +1,44 @@ +# 本地环境 +server.port=9997 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#spring.datasource.jdbc-url=jdbc:mysql://192.168.235.137:33306/udiwms_erp?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3361/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.username=root +spring.datasource.password=root +#spring.datasource.password=89083fb2fc145533 +logging.level.com.glxp.mipsdl.admin.dao=debug +#logging.level.com.glxp.mipsdl.admin.barcode=debug +# 跨域设置 +cors.allowed-origins=* +cors.allowed-headers=Content-Type,ADMIN_ID,ADMIN_TOKEN +cors.allowed-methods=GET,POST,OPTIONS +server.servlet.context-path= +#请求参数长度 +server.tomcat.max-http-form-post-size=100MB +server.max-http-header-size=100MB +#最大上传文件大小(10MB) +spring.servlet.multipart.max-file-size=200MB +spring.servlet.multipart.max-request-size=200MB +server.connectionTimeout=180000 +#U8参数 +#udi管理系统IP地址（上传文件解析后回传） +#UDIWMS_IP=http://127.0.0.1:9991 +UDIWMS_IP=http://192.168.0.66:8500/UDI_WMS_MC +API_KEY=1102 +API_SECRET=4dc07484afd34e8083ba96e8fe564224 +#文件导入 +#0.NULL(空，未配置），1.GLXP(自定义规范标准），2.ZHIYE_V1(智业V1,诏安医院),3.YG_UDPLAT_V1(阳光采购平台）,4.PHXYY(平和县医院) +FILE_VERSION_FLAG=ZHIYE_V1 +#接口实时获取 +#0.NULL(空，未配置）,1.YONGYOU_U8_V3.1(用友3.1版本，片仔癀诊断） 2.YG_UDPLAT_V1.0(阳光采购平台) 3.TEST(标准接口，测试用),4.PHXYY(平和县医院) +#5.ZAXZYY(诏安县医院) +ONLINE_VESRION_FLAG=ZAXZYY +THIRD_ID=thirdId +ok.http.connect-timeout=3000 +ok.http.read-timeout=3000 +ok.http.write-timeout=3000 +# 连接池中整体的空闲连接的最大数量 +ok.http.max-idle-connections=200 +# 连接空闲时间最多为 300 秒 +ok.http.keep-alive-duration=300 + diff --git a/api-sync/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-sync/src/main/resources/mybatis/mapper/inout/OrderDao.xml index 2190f5c..cc62972 100644 --- a/api-sync/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-sync/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -49,8 +49,6 @@ replicateNo=#{replicateNo}, fromSubInvCode=#{fromSubInvCode}, createTime=#{createTime}, - originFromType=#{originFromType}, - WHERE id = #{id} diff --git a/api-sync/src/main/resources/mybatis/mapper/test/TestBusTypeDao.xml b/api-sync/src/main/resources/mybatis/mapper/test/TestBusTypeDao.xml new file mode 100644 index 0000000..f1e87da --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/test/TestBusTypeDao.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/api-sync/src/main/resources/mybatis/mapper/test/TestCorpDao.xml b/api-sync/src/main/resources/mybatis/mapper/test/TestCorpDao.xml new file mode 100644 index 0000000..66435a6 --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/test/TestCorpDao.xml @@ -0,0 +1,27 @@ + + + + + + + + + \ No newline at end of file diff --git a/api-sync/src/main/resources/mybatis/mapper/test/TestInvWarehouseDao.xml b/api-sync/src/main/resources/mybatis/mapper/test/TestInvWarehouseDao.xml new file mode 100644 index 0000000..3f1d78b --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/test/TestInvWarehouseDao.xml @@ -0,0 +1,42 @@ + + + + + + \ No newline at end of file diff --git a/api-sync/src/main/resources/mybatis/mapper/test/TestProductDao.xml b/api-sync/src/main/resources/mybatis/mapper/test/TestProductDao.xml new file mode 100644 index 0000000..90074fd --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/test/TestProductDao.xml @@ -0,0 +1,47 @@ + + + + + + \ No newline at end of file diff --git a/api-sync/src/main/resources/mybatis/mapper/test/TestSubInvWarehouseDao.xml b/api-sync/src/main/resources/mybatis/mapper/test/TestSubInvWarehouseDao.xml new file mode 100644 index 0000000..90b5ebc --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/test/TestSubInvWarehouseDao.xml @@ -0,0 +1,27 @@ + + + + + + \ No newline at end of file diff --git a/api-sync/src/test/java/com/glxp/mipsdl/admin/JsonTest.java b/api-sync/src/test/java/com/glxp/mipsdl/admin/JsonTest.java index 00f8e2b..43ed5fc 100644 --- a/api-sync/src/test/java/com/glxp/mipsdl/admin/JsonTest.java +++ b/api-sync/src/test/java/com/glxp/mipsdl/admin/JsonTest.java @@ -1,6 +1,5 @@ package com.glxp.mipsdl.admin; -import com.glxp.mipsdl.admin.client.http.ZaxyyXmlClient; import com.glxp.mipsdl.admin.http.UHttpUtils; import org.dom4j.Document; import org.dom4j.DocumentException; @@ -40,11 +39,4 @@ public class JsonTest { } } - @Resource - ZaxyyXmlClient xmlClient; - - @Test - public void teS1() { - xmlClient.testWebservice(); - } }