From d82d01f143de670c64e6e4db261af5a87cfd7565 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 22 Jul 2022 16:55:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=AC=AC=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mipsdl/admin/client/http/ZaxyyClient.java | 381 ++++++++++++++++-- .../mipsdl/admin/constant/ConstantStatus.java | 147 +++++++ .../mipsdl/admin/constant/ConstantType.java | 23 ++ .../admin/controller/UdiWmsController.java | 5 - .../mipsdl/admin/dao/auth/AuthAdminDao.java | 19 + .../dao/basic/BasicThirdSysBusApiDao.java | 22 + .../dao/basic/BussinessLocalTypeDao.java | 13 + .../admin/dao/basic/BussinessTypeDao.java | 16 + .../admin/dao/basic/UdiRelevanceDao.java | 12 + .../admin/dao/basic/UnitMaintainDao.java | 18 + .../admin/dao/business/StockOrderDao.java | 12 + .../dao/business/StockOrderDetailDao.java | 12 + .../dao/business/StockOrderUploadLogDao.java | 11 + .../glxp/mipsdl/admin/dao/inout/CodesDao.java | 15 + .../glxp/mipsdl/admin/dao/inout/OrderDao.java | 11 + .../admin/dao/inventory/InvWarehouseDao.java | 18 + .../dao/phxyy/BasicThirdSysBusApiDao.java | 17 - .../admin/dao/thrsys/ThrInvWarehouseDao.java | 14 + .../mipsdl/admin/entity/auth/AuthAdmin.java | 32 ++ .../basic/BasicThirdSysBusApiEntity.java | 33 ++ .../basic/BussinessLocalTypeEntity.java | 37 ++ .../entity/basic/UdiRelevanceEntity.java | 75 ++++ .../entity/basic/UnitMaintainEntity.java | 36 ++ .../business/StockOrderDetailEntity.java | 43 ++ .../entity/business/StockOrderEntity.java | 51 +++ .../business/StockOrderUploadLogEntity.java | 55 +++ .../admin/entity/inout/OrderEntity.java | 66 +++ .../admin/entity/inout/WarehouseEntity.java | 57 +++ .../entity/inventory/InvWarehouseEntity.java | 33 ++ .../entity/thrsys/ThrInvWarehouseEntity.java | 37 ++ .../mipsdl/admin/req/UdiwmsOrderDetail.java | 5 + .../mipsdl/admin/req/UdiwmsOrderRequest.java | 2 + .../mipsdl/admin/req/ZaxzyyOrderRequest.java | 37 ++ .../BussinessLocalTypeFilterRequest.java | 19 + .../thrsys/FilterThrInvWarehouseRequest.java | 28 ++ .../impl/BasicThirdSysBusApiServiceImpl.java | 2 +- .../com/glxp/mipsdl/admin/util/DateUtil.java | 10 + .../mybatis/mapper/auth/AuthAdminDao.xml | 15 + .../mapper/basic/BasicThirdSysBusApiDao.xml | 12 + .../mapper/basic/BussinessLocalTypeDao.xml | 35 ++ .../mybatis/mapper/basic/BussinessTypeDao.xml | 12 + .../mybatis/mapper/basic/UdiRelevanceDao.xml | 13 + .../mybatis/mapper/basic/UnitMaintainDao.xml | 13 + .../mybatis/mapper/business/StockOrderDao.xml | 12 + .../mapper/business/StockOrderDetail.xml | 11 + .../business/StockOrderUploadLogDao.xml | 31 ++ .../mybatis/mapper/inout/CodesDao.xml | 13 + .../mybatis/mapper/inout/OrderDao.xml | 12 + .../mapper/inventory/InvWarehouseDao.xml | 12 + .../mapper/thrsys/ThrInvWarehouseDao.xml | 60 +++ 50 files changed, 1621 insertions(+), 54 deletions(-) create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/constant/ConstantStatus.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/constant/ConstantType.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/auth/AuthAdminDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BasicThirdSysBusApiDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BussinessLocalTypeDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BussinessTypeDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/UdiRelevanceDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/UnitMaintainDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/business/StockOrderDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/business/StockOrderDetailDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/business/StockOrderUploadLogDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inout/CodesDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inout/OrderDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inventory/InvWarehouseDao.java delete mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/phxyy/BasicThirdSysBusApiDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/dao/thrsys/ThrInvWarehouseDao.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/auth/AuthAdmin.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BasicThirdSysBusApiEntity.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BussinessLocalTypeEntity.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/UdiRelevanceEntity.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/UnitMaintainEntity.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/business/StockOrderDetailEntity.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/business/StockOrderEntity.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/business/StockOrderUploadLogEntity.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inout/OrderEntity.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inout/WarehouseEntity.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inventory/InvWarehouseEntity.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrInvWarehouseEntity.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/basic/BussinessLocalTypeFilterRequest.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/thrsys/FilterThrInvWarehouseRequest.java create mode 100644 api-sync/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/basic/BasicThirdSysBusApiDao.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/business/StockOrderDao.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/business/StockOrderDetail.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/inout/CodesDao.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/inout/OrderDao.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml create mode 100644 api-sync/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.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 0f7e635..a228334 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 @@ -1,23 +1,47 @@ package com.glxp.mipsdl.admin.client.http; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ReflectUtil; 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.config.ThirdSysConfig; +import com.glxp.mipsdl.admin.constant.ConstantStatus; +import com.glxp.mipsdl.admin.constant.ConstantType; +import com.glxp.mipsdl.admin.dao.auth.AuthAdminDao; +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.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.InvWarehouseDao; import com.glxp.mipsdl.admin.dao.phxyy.BasicThirdSysDetailDao; +import com.glxp.mipsdl.admin.dao.thrsys.ThrInvWarehouseDao; +import com.glxp.mipsdl.admin.entity.auth.AuthAdmin; +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; +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.phxyy.BasicThirdSysDetailEntity; +import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.mipsdl.admin.entity.zy.ZaZyHeareRequest; -import com.glxp.mipsdl.admin.req.UdiwmsOnhandRequest; -import com.glxp.mipsdl.admin.req.UdiwmsOrderRequest; -import com.glxp.mipsdl.admin.req.UdiwmsPreInOrderRequest; -import com.glxp.mipsdl.admin.req.ZaxzyyOrderRequest; +import com.glxp.mipsdl.admin.req.*; +import com.glxp.mipsdl.admin.req.basic.BussinessLocalTypeFilterRequest; import com.glxp.mipsdl.admin.req.phxyy.PhBusTypeRequest; import com.glxp.mipsdl.admin.req.phxyy.PhProductRequest; import com.glxp.mipsdl.admin.req.phxyy.PhUnitRequest; import com.glxp.mipsdl.admin.req.phxyy.PhWarehouseRequest; -import com.glxp.mipsdl.admin.service.phxyy.BasicThirdSysBusApiService; -import com.glxp.mipsdl.admin.service.phxyy.BussinessOriginTypeService; +import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest; +import com.glxp.mipsdl.admin.util.DateUtil; import com.glxp.mipsdl.admin.util.HttpClient; import com.glxp.mipsdl.common.res.BaseResponse; import com.glxp.mipsdl.common.util.ResultVOUtils; @@ -25,10 +49,12 @@ import lombok.extern.slf4j.Slf4j; import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.DocumentHelper; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Date; import java.util.List; @Slf4j @@ -39,7 +65,34 @@ public class ZaxyyClient { private ThirdSysConfig thirdSysConfig; @Resource private HttpClient httpClient; - + @Resource + private StockOrderDao stockOrderDao; + @Resource + private StockOrderDetailDao stockOrderDetailDao; + @Resource + private BussinessLocalTypeDao bussinessLocalTypeDao; + @Resource + private BasicThirdSysBusApiDao thirdSysBusApiDao; + @Resource + private InvWarehouseDao invWarehouseDao; + @Resource + private ThrInvWarehouseDao thrInvWarehouseDao; + @Resource + private UnitMaintainDao unitMaintainDao; + @Resource + private BussinessTypeDao bussinessTypeDao; + @Resource + private BasicThirdSysDetailDao basicThirdSysDetailDao; + @Resource + private CodesDao codesDao; + @Resource + private UdiRelevanceDao udiRelevanceDao; + @Resource + private AuthAdminDao authAdminDao; + @Resource + private OrderDao orderDao; + @Resource + private StockOrderUploadLogDao stockOrderUploadLogDao; String[] getHeaderArray() { List headArray = new ArrayList<>(); @@ -58,13 +111,6 @@ public class ZaxyyClient { return strArray; } - @Resource - private BasicThirdSysBusApiService basicThirdSysBusApiService; - @Resource - private BussinessOriginTypeService bussinessOriginTypeService; - @Resource - private BasicThirdSysDetailDao basicThirdSysDetailDao; - public BaseResponse testConnect() { String msgHead = "" + @@ -186,10 +232,151 @@ public class ZaxyyClient { } public BaseResponse submitOrders(ZaxzyyOrderRequest udiwmsOrderRequest) { - if (StrUtil.isEmpty(udiwmsOrderRequest.getBillType())) { - return ResultVOUtils.error(500, "单据类型不能未空"); + if (StrUtil.isBlank(udiwmsOrderRequest.getId())) { + return ResultVOUtils.error(500, "单据ID不能为空！"); + } + //查询单据和详情信息，组装第三方系统接口参数所需数据 + StockOrderEntity stockOrderEntity = stockOrderDao.findById(udiwmsOrderRequest.getId()); + List stockOrderDetailEntities = stockOrderDetailDao.findByOrderIdFk(stockOrderEntity.getId()); + + udiwmsOrderRequest.setBillDate(stockOrderEntity.getBilldate()); + udiwmsOrderRequest.setBillNo(stockOrderEntity.getBillNo()); + + BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest(); + bussinessLocalTypeFilterRequest.setAction(stockOrderEntity.getBillType()); + List bussinessLocalTypeEntities = bussinessLocalTypeDao.filterJoin(bussinessLocalTypeFilterRequest); + BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeEntities.get(0); + + //查询第三方系统的单据ID，及第三方系统标识 + BasicThirdSysBusApiEntity thirdSysBusApiEntity = thirdSysBusApiDao.selectByCode(stockOrderEntity.getBillType()); + if (StrUtil.isBlank(thirdSysBusApiEntity.getUrl())) { + return ResultVOUtils.error(500, "接口未配置，无法提交！"); + } + + String thirdId = getThirdId(thirdSysBusApiEntity); + + udiwmsOrderRequest.setThirdSys(thirdId); //第三方系统标识 + udiwmsOrderRequest.setBillType(thirdSysBusApiEntity.getThirdBuyCode()); + + if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) { + udiwmsOrderRequest.setCorpId(stockOrderEntity.getCorpName()); //往来单位编码，需转换为第三方系统的ID + udiwmsOrderRequest.setCorpName(stockOrderEntity.getCorpName()); //往来单位名称，需转换为第三方系统的名称 + } else if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INNOR) { + List invWarehouseEntities = invWarehouseDao.selectByCode(stockOrderEntity.getCorpId()); + InvWarehouseEntity invWarehouseEntity = invWarehouseEntities.get(0); + try { + //根据第三方系统标识，获取对应字段的值 + FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest(); + filterThrInvWarehouseRequest.setCode(invWarehouseEntity.getThirdId()); + filterThrInvWarehouseRequest.setThirdSysFk(thirdId); + List thrInvWarehouseEntities = thrInvWarehouseDao.filterThrInvWarehouse(filterThrInvWarehouseRequest); + ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseEntities.get(0); + udiwmsOrderRequest.setCorpId(thrInvWarehouseEntity.getCode()); //往来单位编码，需转换为第三方系统的ID + udiwmsOrderRequest.setCorpName(thrInvWarehouseEntity.getName()); //往来单位名称，需转换为第三方系统的名称 + } catch (Exception e) { + log.error("查询单据对应的第三方往来单位信息异常", e); + } + } else if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { + //查询往来单位第三方系统对照编码 + UnitMaintainEntity unitMaintainEntity = unitMaintainDao.selectThirdInfoByErpId(stockOrderEntity.getCorpId()); + try { + String thirdCorpId = (String) ReflectUtil.getFieldValue(unitMaintainEntity, unitMaintainEntity.getClass().getField(thirdId)); + udiwmsOrderRequest.setCorpId(thirdCorpId); //往来单位编码，需转换为第三方系统的ID + + String thirdName = getThirdName(thirdId); + String thirdCorpName = (String) ReflectUtil.getFieldValue(unitMaintainEntity, unitMaintainEntity.getClass().getField(thirdName)); + udiwmsOrderRequest.setCorpName(thirdCorpName); //往来单位名称，需转换为第三方系统的名称 + } catch (Exception e) { + log.error(e.getMessage(), e); + } + } + + InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOneByCode(stockOrderEntity.getLocStorageCode()); + try { + ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(invWarehouseEntity.getThirdId(), thirdId); + udiwmsOrderRequest.setLocStorageCode(thrInvWarehouseEntity.getCode()); + udiwmsOrderRequest.setLocStorageName(thrInvWarehouseEntity.getName()); + } catch (Exception e) { + log.error("查询第三方系统仓库异常", e); + } + + udiwmsOrderRequest.setBillFlag(stockOrderEntity.getBillFlag()); //单据状态 + + //查询单据出入库类型 + String mainAction = bussinessTypeDao.selectInoutTypebByLocalAction(stockOrderEntity.getBillType()); + if (ConstantType.TYPE_PUT.equals(mainAction)) { + udiwmsOrderRequest.setInoutType(1); //出入库类型：入库 + } else if (ConstantType.TYPE_OUT.equals(mainAction)) { + udiwmsOrderRequest.setInoutType(2); //出入库类型：出库 + } + + udiwmsOrderRequest.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(DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getProductDate())); + } + if (StrUtil.isNotEmpty(stockOrderDetailEntity.getExpireDate())) { + item.setExpireDate(DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getExpireDate())); + } + + item.setMeasname(udiRelevanceEntity.getMeasname()); + item.setStandard(stockOrderDetailEntity.getSpec()); + item.setRegisterNo(stockOrderDetailEntity.getZczbhhzbapzbh()); + 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); + }); + item.setCodeList(codeDetaiEntities); + } + try { + String thirdProductId = (String) ReflectUtil.getFieldValue(udiRelevanceEntity, thirdId); + item.setProductId(thirdProductId); + + String thirdName = getThirdName(thirdId); + String thirdProductName = (String) ReflectUtil.getFieldValue(udiRelevanceEntity, thirdName); + item.setProductName(thirdProductName); + items.add(item); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + } + + udiwmsOrderRequest.setItem(items); + + //查询扫码单据 + OrderEntity orderEntity = orderDao.findById(stockOrderEntity.getOrderIdFk()); + + ZaZyHeareRequest zaZyHeareRequest = new ZaZyHeareRequest(); + + String key = null; + //提交订单到第三方系统 + if (thirdSysBusApiEntity.getUrl().equals("saveMasterialInput")) { + //采购入库单据 + zaZyHeareRequest.setMsgHeader(getMsgHeader("saveMasterialInput")); + key = "orderSubmitUrl"; + zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsOrderRequest)); + } else if (thirdSysBusApiEntity.getUrl().equals("saveMaterialHight")) { + //临床出库 + zaZyHeareRequest.setMsgHeader(getMsgHeader("saveMaterialHight")); + key = "preInOrderSubmit"; + + UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = submitPreInOrderToThirdSys(udiwmsOrderRequest, orderEntity); + zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest)); + } - BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByOrderType("orderSubmitUrl", thirdSysConfig.getThirdSysConfig().getThirdId(), udiwmsOrderRequest.getBillType()); + + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByOrderType(key, thirdSysConfig.getThirdSysConfig().getThirdId(), udiwmsOrderRequest.getBillType()); String interStr = ""; if (StrUtil.isNotEmpty(basicThirdSysDetailEntity.getOrderTypeUrl())) { @@ -198,23 +385,48 @@ public class ZaxyyClient { } else { interStr = basicThirdSysDetailEntity.getValue(); } - ZaZyHeareRequest zaZyHeareRequest = new ZaZyHeareRequest(); - zaZyHeareRequest.setMsgHeader(getMsgHeader("saveMasterialInput")); - zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsOrderRequest)); - + //记录日志 + StockOrderUploadLogEntity uploadLog = new StockOrderUploadLogEntity(); + uploadLog.setBillDate(DateUtil.parseDate(udiwmsOrderRequest.getBillDate())); + uploadLog.setBillType(stockOrderEntity.getBillType()); + uploadLog.setSubmitTime(new Date()); + uploadLog.setBillNo(udiwmsOrderRequest.getBillNo()); + uploadLog.setFromType(ConstantStatus.THIRD_ORDER_UPLOAD); String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + interStr, zaZyHeareRequest, getHeaderArray()); response = parseErrorMsg(response); - try { - BaseResponse baseResponse = - JSONObject.parseObject(response, new TypeReference() { - }); - return baseResponse; - } catch (Exception e) { - e.printStackTrace(); - } - - return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果" + "（" + 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(null); + uploadLog.setResult("提交成功"); + stockOrderUploadLogDao.insert(uploadLog); + 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("提交失败，错误信息：" + e.getMessage()); + stockOrderUploadLogDao.insert(uploadLog); + return ResultVOUtils.error(500, "提交失败"); + } + }else { + uploadLog.setStatus(3); + uploadLog.setResult("提交失败，调用接口返回为空"); + stockOrderUploadLogDao.insert(uploadLog); + return ResultVOUtils.error(500, "提交失败"); + } } @@ -282,6 +494,55 @@ public class ZaxyyClient { return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果" + "（" + response + ")"); } + 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; + } + + public UdiwmsPreInOrderRequest submitPreInOrderToThirdSys(ZaxzyyOrderRequest udiwmsOrderRequest, OrderEntity orderEntity) { + + UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = new UdiwmsPreInOrderRequest(); + if (udiwmsOrderRequest != null) { + BeanUtils.copyProperties(udiwmsOrderRequest, udiwmsPreInOrderRequest); + udiwmsPreInOrderRequest.setLocInvCode(udiwmsOrderRequest.getLocStorageCode()); + udiwmsPreInOrderRequest.setLocInvName(udiwmsOrderRequest.getLocStorageName()); + if (orderEntity.getReviewUser() != null) { + AuthAdmin authAdmin = authAdminDao.findById(orderEntity.getReviewUser().longValue()); + udiwmsPreInOrderRequest.setActor(authAdmin.getEmployeeName()); + } else if (orderEntity.getCreateUser() != null) { + AuthAdmin authAdmin = authAdminDao.findById(orderEntity.getCreateUser().longValue()); + udiwmsPreInOrderRequest.setActor(authAdmin.getEmployeeName()); + } + List itemDTOS = new ArrayList<>(); + if (CollUtil.isNotEmpty(udiwmsOrderRequest.getItem())) { + for (UdiwmsOrderDetail udiwmsOrderDetail : udiwmsOrderRequest.getItem()) { + if (CollUtil.isNotEmpty(udiwmsOrderDetail.getCodeList())) { + for (UdiwmsOrderDetail.CodeDetaiEntity codeDetaiEntity : udiwmsOrderDetail.getCodeList()) { + UdiwmsPreInOrderRequest.ItemDTO itemDTO = new UdiwmsPreInOrderRequest.ItemDTO(); + BeanUtils.copyProperties(udiwmsOrderDetail, itemDTO); + itemDTO.setCode(codeDetaiEntity.getCode()); + itemDTO.setCount(codeDetaiEntity.getCount()); + itemDTOS.add(itemDTO); + + } + } + } + } + udiwmsPreInOrderRequest.setItems(itemDTOS); + + } + + return udiwmsPreInOrderRequest; + } public String parseErrorMsg(String response) { if (response.contains(" filterSysBusApi(FilterBusTypeRequest filterBasicThirdSysDetailRequest); + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BussinessLocalTypeDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BussinessLocalTypeDao.java new file mode 100644 index 0000000..eb01eb9 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BussinessLocalTypeDao.java @@ -0,0 +1,13 @@ +package com.glxp.mipsdl.admin.dao.basic; + +import com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity; +import com.glxp.mipsdl.admin.req.basic.BussinessLocalTypeFilterRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface BussinessLocalTypeDao { + + List filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BussinessTypeDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BussinessTypeDao.java new file mode 100644 index 0000000..966b527 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BussinessTypeDao.java @@ -0,0 +1,16 @@ +package com.glxp.mipsdl.admin.dao.basic; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface BussinessTypeDao { + + /** + * 根据业务单据编码查询出入库类型 + * + * @param localAction + * @return + */ + String selectInoutTypebByLocalAction(@Param("localAction") String localAction); +} 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 new file mode 100644 index 0000000..293ad33 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/UdiRelevanceDao.java @@ -0,0 +1,12 @@ +package com.glxp.mipsdl.admin.dao.basic; + +import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface UdiRelevanceDao { + + UdiRelevanceEntity selectById(@Param("id") String id); + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/UnitMaintainDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/UnitMaintainDao.java new file mode 100644 index 0000000..4d46ec2 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/UnitMaintainDao.java @@ -0,0 +1,18 @@ +package com.glxp.mipsdl.admin.dao.basic; + +import com.glxp.mipsdl.admin.entity.basic.UnitMaintainEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface UnitMaintainDao { + + /** + * 根据erpId查询往来单位第三方系统编码和第三方系统名称 + * + * @param erpId + * @return + */ + UnitMaintainEntity selectThirdInfoByErpId(@Param("erpId") String erpId); + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/business/StockOrderDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/business/StockOrderDao.java new file mode 100644 index 0000000..980bb3b --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/business/StockOrderDao.java @@ -0,0 +1,12 @@ +package com.glxp.mipsdl.admin.dao.business; + +import com.glxp.mipsdl.admin.entity.business.StockOrderEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface StockOrderDao { + + + StockOrderEntity findById(@Param("id") String id); +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/business/StockOrderDetailDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/business/StockOrderDetailDao.java new file mode 100644 index 0000000..5204df7 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/business/StockOrderDetailDao.java @@ -0,0 +1,12 @@ +package com.glxp.mipsdl.admin.dao.business; + +import com.glxp.mipsdl.admin.entity.business.StockOrderDetailEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface StockOrderDetailDao { + + List findByOrderIdFk(String orderIdFk); +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/business/StockOrderUploadLogDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/business/StockOrderUploadLogDao.java new file mode 100644 index 0000000..6aa25b7 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/business/StockOrderUploadLogDao.java @@ -0,0 +1,11 @@ +package com.glxp.mipsdl.admin.dao.business; + +import com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface StockOrderUploadLogDao { + + int insert(StockOrderUploadLogEntity record); + +} \ No newline at end of file diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inout/CodesDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inout/CodesDao.java new file mode 100644 index 0000000..572f19d --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inout/CodesDao.java @@ -0,0 +1,15 @@ +package com.glxp.mipsdl.admin.dao.inout; + +import com.glxp.mipsdl.admin.entity.inout.WarehouseEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface CodesDao { + + + List findByReceiptId(@Param("orderId") String orderId); + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inout/OrderDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inout/OrderDao.java new file mode 100644 index 0000000..ca24883 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inout/OrderDao.java @@ -0,0 +1,11 @@ +package com.glxp.mipsdl.admin.dao.inout; + +import com.glxp.mipsdl.admin.entity.inout.OrderEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface OrderDao { + + OrderEntity findById(String orderId); + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inventory/InvWarehouseDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inventory/InvWarehouseDao.java new file mode 100644 index 0000000..5c90ba8 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inventory/InvWarehouseDao.java @@ -0,0 +1,18 @@ +package com.glxp.mipsdl.admin.dao.inventory; + +import com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity; + +import java.util.List; + +public interface InvWarehouseDao { + + List selectByCode(String code); + + /** + * 查询单个仓库 + * + * @param locStorageCode + * @return + */ + InvWarehouseEntity selectOneByCode(String code); +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/phxyy/BasicThirdSysBusApiDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/phxyy/BasicThirdSysBusApiDao.java deleted file mode 100644 index 1051a49..0000000 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/phxyy/BasicThirdSysBusApiDao.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.glxp.mipsdl.admin.dao.phxyy; - -import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysBusApiEntity; -import com.glxp.mipsdl.admin.req.phxyy.FilterBusTypeRequest; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface BasicThirdSysBusApiDao { - - boolean insertSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity); - - boolean updateSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity); - - List filterSysBusApi(FilterBusTypeRequest filterBasicThirdSysDetailRequest); -} 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 new file mode 100644 index 0000000..91aa2d4 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/thrsys/ThrInvWarehouseDao.java @@ -0,0 +1,14 @@ +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.Param; + +import java.util.List; + +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/auth/AuthAdmin.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/auth/AuthAdmin.java new file mode 100644 index 0000000..9d68400 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/auth/AuthAdmin.java @@ -0,0 +1,32 @@ +package com.glxp.mipsdl.admin.entity.auth; + +import lombok.Data; + +import java.util.Date; + +@Data +public class AuthAdmin { + + // 主键 + private Long id; + // 昵称 + private String userName; + // 登录密码 + private String passWord; + + // 最后登录ip + private String lastLoginIp; + // 最后登录时间 + private Date lastLoginTime; + // 创建时间 + private Date createTime; + // 状态 + private Integer userFlag; + + private Date lastModifyTime; + private String comments; + private String employeeName; + private Integer CustomerId; + private String locInvCode; + private String locSubInvCode; +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BasicThirdSysBusApiEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BasicThirdSysBusApiEntity.java new file mode 100644 index 0000000..e6f1bfc --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BasicThirdSysBusApiEntity.java @@ -0,0 +1,33 @@ +package com.glxp.mipsdl.admin.entity.basic; + +import lombok.Data; + +@Data +public class BasicThirdSysBusApiEntity { + + private Integer id; + private String code; + private String name; + private String thirdBuyName; //第三方系统单据类型名称 + private String thirdBuyCode; //第三方系统单据类型代码 + private String thirdSys; + private String url; + private Integer type; + private String remark; + private Integer inoutType; + + //扩展字段 暂未启用 + private String filed; + private String filed1; + private String filed2; + private String filed3; + private String filed4; + + + /** + * "code": "29104", + * "name": "采购入库", + * "remark": "无形资产入库单", + * "inoutType": "1" + */ +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BussinessLocalTypeEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BussinessLocalTypeEntity.java new file mode 100644 index 0000000..dbc1db3 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BussinessLocalTypeEntity.java @@ -0,0 +1,37 @@ +package com.glxp.mipsdl.admin.entity.basic; + +import lombok.Data; + +import java.util.Date; + +@Data +public class BussinessLocalTypeEntity { + private Integer id; + private String action; + private String name; + private String localAction; + private String originAction; + private String mainAction; + private String localName; + private String remark; + private boolean checkEnable; + private boolean advanceType; + private boolean changeEnable; + private boolean spUse; + private String storageCode; + private int corpType; + private String defaultUnit; + private boolean genUnit; + private String thirdAction; + private String thirdSys; + private Date updateTime; + private String prefix; + private String localPrefix; + private boolean preIn; + private boolean outTospms; + private boolean ullageFill; + private boolean scanPreIn; + private boolean vailInv; + private boolean codeFillCheck; + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/UdiRelevanceEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/UdiRelevanceEntity.java new file mode 100644 index 0000000..3ca53b3 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/UdiRelevanceEntity.java @@ -0,0 +1,75 @@ +package com.glxp.mipsdl.admin.entity.basic; + +import lombok.Data; + +@Data +public class UdiRelevanceEntity { + + private String id; + private String thirdId; + private String thirdName; + private String uuid; + private Boolean isUseDy; + private String updateTime; + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + private String thirdName1; + private String thirdName2; + private String thirdName3; + private String thirdName4; + private String manufactory; + private String measname; + private String ybbm; + private String sptm; + private Boolean isDisable; + private Boolean isLock; + private String mainId; + private String mainName; + private Integer lockStatus; + private String udplatCode; + private Boolean isAdavence; + private String supName; + private String originUuid; + private String price; + private String modifyTime;//修改时间 + + private Boolean isCheck; + private boolean allowNoBatch; + private boolean allowNoExpire; + private boolean allowNoProduct; + + //规格型号 + private String ggxh; + + //器械类别 + private String qxlb; + + //产品类别 + private String cplb; + + //分类编码 + private String flbm; + + //医疗器械注册人 + private String ylqxzcrbarmc; + + //注册人英文名称 + private String ylqxzcrbarywmc; + + //统一社会信用号 + private String tyshxydm; + + //注册证/备案号 + private String zczbhhzbapzbh; + + //产品描述 + private String cpms; + + public Integer getLockStatus() { + if (lockStatus == null) + return 1; + return lockStatus; + } +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/UnitMaintainEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/UnitMaintainEntity.java new file mode 100644 index 0000000..4ac7eba --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/UnitMaintainEntity.java @@ -0,0 +1,36 @@ +package com.glxp.mipsdl.admin.entity.basic; + +import lombok.Data; + +import java.util.Date; + +@Data +public class UnitMaintainEntity { + + public Integer id; + public String thirdId; + public String thirdName; + public String erpId; + public String name; + public String spell; + public String addr; + public String status; + public String type; + public String contact; + public String mobile; + public String creditNo; + + + public String thirdId1; + public String thirdId2; + public String thirdId3; + public String thirdId4; + public String thirdName1; + public String thirdName2; + public String thirdName3; + public String thirdName4; + + public Date updateTime; + + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/business/StockOrderDetailEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/business/StockOrderDetailEntity.java new file mode 100644 index 0000000..7442ff3 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/business/StockOrderDetailEntity.java @@ -0,0 +1,43 @@ +package com.glxp.mipsdl.admin.entity.business; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class StockOrderDetailEntity { + + private String id; + private String orderIdFk; + private String productId; + private String productName; + private String spec; + private String batchNo; + private String expireDate; + private String productDate; + private Integer count; + private Integer reCount; + private Integer sweepCount; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; + private BigDecimal price; + private String relId; + + //销售清单号（第二票） + private String secSalesListNo; + + //销售发票号（第一票） + private String firstSalesInvNo; + + //销售发票号（第二票） + private String secSalesInvNo; + + //开票日期 + private String invoiceDate; + private String manufactory; + private boolean allowNoBatch; + + private String code; + private String serialNo; + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/business/StockOrderEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/business/StockOrderEntity.java new file mode 100644 index 0000000..fdf75e0 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/business/StockOrderEntity.java @@ -0,0 +1,51 @@ +package com.glxp.mipsdl.admin.entity.business; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class StockOrderEntity { + private String id; + private String billNo; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private String billdate; + private String corpId; + private String corpName; + private String billType; + private String billFlag; + 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 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; +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/business/StockOrderUploadLogEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/business/StockOrderUploadLogEntity.java new file mode 100644 index 0000000..8915f69 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/business/StockOrderUploadLogEntity.java @@ -0,0 +1,55 @@ +package com.glxp.mipsdl.admin.entity.business; + +import lombok.Data; + +import java.util.Date; + +/** + * 业务单据上传日志 + */ +@Data +public class StockOrderUploadLogEntity { + + private Long id; + + /** + * 单据号 + */ + private String billNo; + + /** + * 单据日期 + */ + private Date billDate; + + /** + * 单据类型 + */ + private String billType; + + /** + * 第三方单据号 + */ + private String thrBillNo; + + /** + * 提交时间 + */ + private Date submitTime; + + /** + * 提交状态 0.未提交 1.正在处理 2.已提交 3.提交失败 + */ + private Integer status; + + /** + * 结果信息 + */ + private String result; + + private String billTypeName; + + private Integer fromType; + private String uploadData; + +} 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 new file mode 100644 index 0000000..d8f8140 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inout/OrderEntity.java @@ -0,0 +1,66 @@ +package com.glxp.mipsdl.admin.entity.inout; + +import lombok.Data; + +import java.util.Date; + +@Data +public class OrderEntity { + + private String id; + private String corpOrderId; + private String action; + private String actDate; + + private String actor; + private String mainAction; + private String fromCorpId; + private String fromCorp; + private Integer status; + + private Integer fromType; + private Integer contrastStatus; + private String erpFk; + private Integer signStatus; + private String stockCheckFk; + private String remark; + private Integer receiveStatus; + private String supId; + + + private String customerId; + + private Integer exportStatus; + private String exportFilePath; + private Integer dlCount; + private String invStorageCode; + private String invWarehouseCode; + private String locStorageCode; + + //补单单号 + private String supplementNo; + private String ullageSupNo; + private Integer createUser; + private Integer reviewUser; + + private boolean isError; + private boolean outChangeEnable; + private String originUllageSupNo; + private Date updateTime; + private boolean preCheck; + //审核时间 + private Date auditTime; + private String thirdBillNo; + + //复制单号，多个单号之间使用英文逗号,分隔 + private String replicateNo; + + private boolean syncOutChange; + private String createTime; + private String fromSubInvCode; + + + private String billTypeName; + private String subInvName; + private String invName; +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inout/WarehouseEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inout/WarehouseEntity.java new file mode 100644 index 0000000..5bb7902 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inout/WarehouseEntity.java @@ -0,0 +1,57 @@ +package com.glxp.mipsdl.admin.entity.inout; + +import lombok.Data; + +@Data +public class WarehouseEntity { + private Long id; + private String action; + private String mainAction; + private String code; + private String corpOrderId; + private String actor; + private String actDate; + private String fromCorpId; + private String fromCorp; + private String orderId; + private String batchNo; + private String produceDate; + private String expireDate; + private String serialNo; + private Integer count; + private String packageLevel; + private String warehouseCode; + + private String customerId; + private String nameCode; + private Integer sCount; + private String supId;//供应商ID + private String supName; + private String invStorageCode; + private String invWarehouseCode; + private String relId; + private Integer status; + private String locStorageCode; + private String fromSubInvCode; + + private String mySupId; + + public String getSupId() { + + if (supId == null) { + return null; + } else if (supId.equals("")) + return null; + return supId; + } + + public Integer getCount() { + + if (count == null) { + return 1; + } + if (count == 0) + return 1; + return count; + } +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inventory/InvWarehouseEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inventory/InvWarehouseEntity.java new file mode 100644 index 0000000..b187f24 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inventory/InvWarehouseEntity.java @@ -0,0 +1,33 @@ +package com.glxp.mipsdl.admin.entity.inventory; + +import lombok.Data; + +import java.util.Date; + +@Data +public class InvWarehouseEntity { + private Integer id; + private Integer pid; + private String code; + private String name; + private Boolean advanceType; + private Boolean isDefault; + private Integer status; + private Date updateTime; + private String remark; + private Integer level; + private String pcode; + private String pName; + + /** + * 第三方仓库ID + */ + private String thirdId; + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + + private boolean spUse; + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrInvWarehouseEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrInvWarehouseEntity.java new file mode 100644 index 0000000..af42ab5 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrInvWarehouseEntity.java @@ -0,0 +1,37 @@ +package com.glxp.mipsdl.admin.entity.thrsys; + +import lombok.Data; + +import java.util.Date; + +/** + * 第三方仓库信息 + */ +@Data +public class ThrInvWarehouseEntity { + + private Integer id; + private Integer pid; + private String code; + private String name; + private Boolean advanceType; + private Boolean isDefault; + private Integer status; + private Date updateTime; + private String remark; + + /** + * 仓库等级 + */ + private Integer level; + + /** + * 父级仓库编码 + */ + private String pcode; + + /** + * 第三方系统标识 + */ + private String thirdSysFk; +} \ No newline at end of file diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderDetail.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderDetail.java index 65166ef..1a33d1b 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderDetail.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderDetail.java @@ -27,6 +27,11 @@ public class UdiwmsOrderDetail { private String remark1; //备注1/规格型号ID private String remark2; //备注2/型号 private String remark3; //备注3/规格 + + private boolean allowNoBatch; + private String code; + private String serialNo; + private List codeList; public static class CodeDetaiEntity { diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderRequest.java index 5295560..3492cb7 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderRequest.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderRequest.java @@ -7,6 +7,8 @@ import java.util.List; @Data public class UdiwmsOrderRequest { + private String id; //业务单据ID + private String startDate; //起始日期 private String endDate; //结束日期 private String billNo; //单据号 diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/ZaxzyyOrderRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/ZaxzyyOrderRequest.java index fb2dacc..a52db18 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/ZaxzyyOrderRequest.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/ZaxzyyOrderRequest.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.admin.req; import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; import java.util.List; @Data @@ -20,6 +22,41 @@ public class ZaxzyyOrderRequest { private String locInvName; 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/basic/BussinessLocalTypeFilterRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/basic/BussinessLocalTypeFilterRequest.java new file mode 100644 index 0000000..93d7678 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/basic/BussinessLocalTypeFilterRequest.java @@ -0,0 +1,19 @@ +package com.glxp.mipsdl.admin.req.basic; + +import lombok.Data; + +@Data +public class BussinessLocalTypeFilterRequest { + private String action; + private String name; + private String mainAction; + private Boolean enabled; + private String originAction; + private Boolean changeEnable; + private Boolean isFilterBind; + private Boolean spUse; + private Boolean isFilter; + private String code; + private Integer userId; + private String lastUpdateTime; +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/thrsys/FilterThrInvWarehouseRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/thrsys/FilterThrInvWarehouseRequest.java new file mode 100644 index 0000000..6c88f23 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/thrsys/FilterThrInvWarehouseRequest.java @@ -0,0 +1,28 @@ +package com.glxp.mipsdl.admin.req.thrsys; + +import lombok.Data; + +import java.util.Date; + +@Data +public class FilterThrInvWarehouseRequest{ + + private Integer id; + private Integer pid; + private String code; + private String name; + private Boolean advanceType; + private Boolean isDefault; + private Date updateTime; + private String key; + private String pcode; + private Integer level; + + private String lastUpdateTime; + + /** + * 第三方系统标识 + */ + private String thirdSysFk; + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/impl/BasicThirdSysBusApiServiceImpl.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/impl/BasicThirdSysBusApiServiceImpl.java index 5af3133..f706f38 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/impl/BasicThirdSysBusApiServiceImpl.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/impl/BasicThirdSysBusApiServiceImpl.java @@ -1,7 +1,7 @@ package com.glxp.mipsdl.admin.service.phxyy.impl; import cn.hutool.core.collection.CollUtil; -import com.glxp.mipsdl.admin.dao.phxyy.BasicThirdSysBusApiDao; +import com.glxp.mipsdl.admin.dao.basic.BasicThirdSysBusApiDao; import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysBusApiEntity; import com.glxp.mipsdl.admin.req.phxyy.FilterBusTypeRequest; import com.glxp.mipsdl.admin.service.phxyy.BasicThirdSysBusApiService; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/util/DateUtil.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/util/DateUtil.java index 58f5b0e..2872d60 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/util/DateUtil.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/util/DateUtil.java @@ -477,4 +477,14 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils { condition.put("startDate",df.format(calendar.getTime())); return condition; } + + public static String formatExpireTime(String str) { + try { + Date date = DateUtil.parseDate(str, "yyyyMMdd"); + return formatDate(date, "yyyy-MM-dd"); + } catch (ParseException e) { + e.printStackTrace(); + } + return str; + } } \ No newline at end of file diff --git a/api-sync/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/api-sync/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml new file mode 100644 index 0000000..2ba2bab --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/api-sync/src/main/resources/mybatis/mapper/basic/BasicThirdSysBusApiDao.xml b/api-sync/src/main/resources/mybatis/mapper/basic/BasicThirdSysBusApiDao.xml new file mode 100644 index 0000000..e539f82 --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/basic/BasicThirdSysBusApiDao.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/api-sync/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-sync/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml new file mode 100644 index 0000000..0c28f3d --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -0,0 +1,35 @@ + + + + + + + + diff --git a/api-sync/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-sync/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml new file mode 100644 index 0000000..1a626f4 --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/api-sync/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-sync/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml new file mode 100644 index 0000000..06acea0 --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/api-sync/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml b/api-sync/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml new file mode 100644 index 0000000..e4ccb24 --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/api-sync/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/api-sync/src/main/resources/mybatis/mapper/business/StockOrderDao.xml new file mode 100644 index 0000000..d5a21b2 --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/business/StockOrderDao.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/api-sync/src/main/resources/mybatis/mapper/business/StockOrderDetail.xml b/api-sync/src/main/resources/mybatis/mapper/business/StockOrderDetail.xml new file mode 100644 index 0000000..e20ca02 --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/business/StockOrderDetail.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/api-sync/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml b/api-sync/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml new file mode 100644 index 0000000..1eb40e3 --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + id, billNo, billDate, billType, thrBillNo, submitTime, `status`, `result` + + + + insert into stock_order_upload_log (billNo, billDate, billType, + thrBillNo, submitTime, `status`, + `result`,fromType) + values (#{billNo,jdbcType=VARCHAR}, #{billDate,jdbcType=TIMESTAMP}, #{billType,jdbcType=VARCHAR}, + #{thrBillNo,jdbcType=VARCHAR}, #{submitTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, + #{result,jdbcType=VARCHAR},#{fromType}) + + + \ No newline at end of file diff --git a/api-sync/src/main/resources/mybatis/mapper/inout/CodesDao.xml b/api-sync/src/main/resources/mybatis/mapper/inout/CodesDao.xml new file mode 100644 index 0000000..7ac495f --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/inout/CodesDao.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/api-sync/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-sync/src/main/resources/mybatis/mapper/inout/OrderDao.xml new file mode 100644 index 0000000..7bbbb7d --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/api-sync/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml b/api-sync/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml new file mode 100644 index 0000000..c38f0b5 --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/api-sync/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/api-sync/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml new file mode 100644 index 0000000..ab06e54 --- /dev/null +++ b/api-sync/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml @@ -0,0 +1,60 @@ + + + + + + + + + + \ No newline at end of file