From 61bbeeda53ce0d62cca166582e85f79f5b158b6a Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Tue, 18 Apr 2023 17:53:27 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E6=8B=89=E5=8F=96=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E6=8F=92=E5=85=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/constant/BasicProcessStatus.java | 4 + .../com/glxp/api/constant/ConstantStatus.java | 4 +- .../com/glxp/api/dao/basic/BasicCorpDao.java | 7 +- .../glxp/api/dao/basic/BasicHospTypeDao.java | 5 +- .../glxp/api/dao/basic/BasicProductsDao.java | 9 ++ .../dao/basic/CompanyProductRelevanceDao.java | 10 ++ .../com/glxp/api/dao/purchase/SupCertDao.java | 3 +- .../glxp/api/dao/purchase/SupCertSetDao.java | 3 +- .../glxp/api/dao/purchase/SupCompanyDao.java | 4 +- .../api/dao/purchase/SupManufacturerDao.java | 3 +- .../glxp/api/dao/purchase/SupProductDao.java | 3 +- .../api/entity/basic/BasicHospTypeEntity.java | 11 ++ .../glxp/api/http/sync/SpGetHttpClient.java | 23 +++- .../res/sync/SpsSyncBasicDataResponse.java | 23 ++++ .../service/basic/BasicHospTypeService.java | 3 +- .../basic/impl/BasicCorpServiceImpl.java | 4 +- .../basic/impl/BasicHospTypeServiceImpl.java | 3 +- .../glxp/api/service/sync/HeartService.java | 105 +++++++++++++++++- .../java/com/glxp/api/task/SyncHeartTask.java | 20 ++-- .../java/com/glxp/api/util/OkHttpCli.java | 1 + 20 files changed, 223 insertions(+), 25 deletions(-) create mode 100644 src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java create mode 100644 src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java create mode 100644 src/main/java/com/glxp/api/res/sync/SpsSyncBasicDataResponse.java diff --git a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java index ec0c5da9c..04e16bc8d 100644 --- a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java +++ b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java @@ -28,6 +28,10 @@ public class BasicProcessStatus { public static final String NEW_ALL_DATA = "7"; //所有最新数据 public static final String NEW_ALL_BUS = "8"; public static final String NEW_ALL_ORDER = "9"; + /** + * 基础数据 + */ + public static final String BASIC_DATA = "21"; public static final String ALL_BUS_ORDER = "11"; public static final String NEW_ALL_DI = "10"; public static final String NEW_ALL_THR_DATA = "12"; //所有第三方基础数据 diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index ed092c876..1cd6559c4 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/src/main/java/com/glxp/api/constant/ConstantStatus.java @@ -228,13 +228,15 @@ public class ConstantStatus { //自动下载所有数据 - public static final String SYNC_DOWNLOAD_BASIC_DATA = "AutoDownloadAllData"; + public static final String SYNC_DOWNLOAD_ALL_DATA = "AutoDownloadAllData"; //自动下载单据数据 public static final String SYNC_DOWNLOAD_BUS_TYPE = "AutoDownloadBusType"; //自动下载单据数据 public static final String SYNC_DOWNLOAD_SCAN_ORDER = "AutoDownloadOrder"; //自动下载DI数据 public static final String SYNC_DOWNLOAD_DI_PRODUCTS = "AutoDownloadDiProducts"; + //自动下载基础数据 + public static final String SYNC_DOWNLOAD_BASIC_DATA = "AutoDownloadBasicData"; public static final int SYNC_STATUS_SUCCESS = 1; //处理成功 public static final int SYNC_STATUS_FAIL = 2; //处理失败 diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java index 9f0a685d4..3a2b2135b 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.basic; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.res.thrsys.ThrCorpsResponse; @@ -11,16 +12,16 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface BasicCorpDao { +public interface BasicCorpDao extends BaseMapperPlus { List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity); boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse); - boolean insert(BasicCorpEntity basicUnitMaintainEntity); + int insert(BasicCorpEntity basicUnitMaintainEntity); - boolean updateById(BasicCorpEntity basicUnitMaintainSaveRequest); + int updateById(BasicCorpEntity basicUnitMaintainSaveRequest); BasicCorpEntity selectByThirdId(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); diff --git a/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java index 40ac9bb68..af66599e2 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java @@ -1,14 +1,17 @@ package com.glxp.api.dao.basic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicHospTypeEntity; + import java.util.List; import com.glxp.api.res.basic.BasicHospTypeResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; + @Mapper -public interface BasicHospTypeDao extends BaseMapper { +public interface BasicHospTypeDao extends BaseMapperPlus { List getTreeList(); diff --git a/src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java b/src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java new file mode 100644 index 000000000..3e4ff8923 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.basic; + +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.basic.BasicProductsEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BasicProductsDao extends BaseMapperPlus { +} diff --git a/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java new file mode 100644 index 000000000..b8bc5a16e --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java @@ -0,0 +1,10 @@ +package com.glxp.api.dao.basic; + +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.basic.BasicProductsEntity; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CompanyProductRelevanceDao extends BaseMapperPlus { +} diff --git a/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java b/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java index b41da274e..1a880f472 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java @@ -2,6 +2,7 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.req.purchase.FilterSupCertRequest; import com.glxp.api.req.purchase.purPlanPrintRequest; @@ -11,7 +12,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface SupCertDao extends BaseMapper { +public interface SupCertDao extends BaseMapperPlus { List filterCompanyCert(FilterSupCertRequest filterSupCertRequest); diff --git a/src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java b/src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java index 3e9d9ffcc..4b189a6b4 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.purchase; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.SupCertSetEntity; import com.glxp.api.req.purchase.FilterCertSetsRequest; import org.apache.ibatis.annotations.Mapper; @@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface SupCertSetDao { +public interface SupCertSetDao extends BaseMapperPlus { List filterCertSets(FilterCertSetsRequest filterCertSetsRequest); boolean insertCertSet(SupCertSetEntity supCertSetEntity); diff --git a/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java b/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java index 4ed837eb6..181dcb407 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java @@ -1,6 +1,8 @@ package com.glxp.api.dao.purchase; +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.entity.purchase.SupCompanyEntity; import com.glxp.api.req.purchase.FilterSupCompanyRequest; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +11,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface SupCompanyDao { +public interface SupCompanyDao extends BaseMapperPlus { SupCompanyEntity findCompany(String CustomerId); diff --git a/src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java b/src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java index 8f02b9f31..80457b723 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.purchase; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.SupManufacturerEntity; import com.glxp.api.req.purchase.FilterSupManufacturerRequest; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface SupManufacturerDao { +public interface SupManufacturerDao extends BaseMapperPlus { SupManufacturerEntity findCompany(Long id); diff --git a/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java index 5d8a7441c..14483eb33 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.purchase; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.SupProductEntity; import com.glxp.api.req.purchase.FilterPoductRequest; import com.glxp.api.res.purchase.SupProductResponse; @@ -10,7 +11,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface SupProductDao { +public interface SupProductDao extends BaseMapperPlus { SupProductEntity findRegistration(Long id); diff --git a/src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java index b68b8d93c..f5245f9a0 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + import java.util.Date; + import lombok.Data; @Data @@ -61,21 +63,30 @@ public class BasicHospTypeEntity { @TableField(value = "updateUser") private String updateUser; + @TableField(exist = false) public static final String COL_ID = "id"; + @TableField(exist = false) public static final String COL_CODE = "code"; + @TableField(exist = false) public static final String COL_PARENTCODE = "parentCode"; + @TableField(exist = false) public static final String COL_NAME = "name"; + @TableField(exist = false) public static final String COL_REMARK = "remark"; + @TableField(exist = false) public static final String COL_CREATETIME = "createTime"; + @TableField(exist = false) public static final String COL_UPDATETIME = "updateTime"; + @TableField(exist = false) public static final String COL_CREATEUSER = "createUser"; + @TableField(exist = false) public static final String COL_UPDATEUSER = "updateUser"; } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java index 74d8ef8ba..a0101a41b 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -1,5 +1,6 @@ package com.glxp.api.http.sync; +import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -44,7 +45,7 @@ public class SpGetHttpClient { } public String[] buildHeader() { - String[] headers = {"apiKey", apiKey, "apiSecret", apiSecret}; + String[] headers = {"api_key", apiKey, "secret_key", apiSecret}; return headers; } @@ -237,6 +238,26 @@ public class SpGetHttpClient { return response; } + /** + * 拉取UDI自助平台基础数据 + * + * @return + */ + public String pullBasicData() { + + String result = okHttpCli.doGet(getIpUrl() + "/sps/sync/basicData", null, buildHeader()); + return result; + + } + + public void finishTask(String id) { + BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest(); + basicExportStatusRequest.setId(id); + String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/basic/udiinfo/finishTask" + , JSONUtil.toJsonStr(basicExportStatusRequest), buildHeader()); + + } + /** * 上传第三方基础信息数据 * diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncBasicDataResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncBasicDataResponse.java new file mode 100644 index 000000000..8f3badf37 --- /dev/null +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncBasicDataResponse.java @@ -0,0 +1,23 @@ +package com.glxp.api.res.sync; + +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.purchase.*; +import lombok.Data; + +import java.util.List; + +@Data +public class SpsSyncBasicDataResponse extends BaseSyncResponse { + + + List hospTypeList; + List udiRelevanceList; + List productsList; + List relevanceList; + List corpList; + List supCertList; + List supCertSetList; + List supCompanyList; + List supManufacturerList; + List supProductList; +} diff --git a/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java b/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java index a767600e8..2f6e3963c 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.BasicHospTypeEntity; import com.glxp.api.req.basic.BasicHospTypeFilterRequest; import com.glxp.api.req.basic.BasicHospTypeRequest; @@ -10,7 +11,7 @@ import com.glxp.api.res.basic.UdiRelevanceResponse; import java.util.List; -public interface BasicHospTypeService { +public interface BasicHospTypeService extends IService { List filterHospTypeList(BasicHospTypeFilterRequest basicHospTypeFilterRequest); diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java index 3ecf7a8ad..f615fa9d5 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java @@ -50,13 +50,13 @@ public class BasicCorpServiceImpl implements BasicCorpService { @Override public boolean insert(BasicCorpEntity basicUnitMaintainEntity) { - return basicCorpDao.insert(basicUnitMaintainEntity); + return basicCorpDao.insert(basicUnitMaintainEntity)>0?true:false; } @Override public boolean updateById(BasicCorpEntity basicUnitMaintainSaveRequest) { basicUnitMaintainSaveRequest.setUpdateTime(new Date()); - return basicCorpDao.updateById(basicUnitMaintainSaveRequest); + return basicCorpDao.updateById(basicUnitMaintainSaveRequest)>0?true:false; } @Override diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java index 24c3884c8..7c14d28ab 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicHospTypeDao; import com.glxp.api.dao.basic.UdiRelevanceDao; @@ -24,7 +25,7 @@ import java.util.Date; import java.util.List; @Service -public class BasicHospTypeServiceImpl implements BasicHospTypeService { +public class BasicHospTypeServiceImpl extends ServiceImpl implements BasicHospTypeService { @Resource BasicHospTypeDao basicHospTypeDao; diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 91da593c0..39ad7a5bc 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -7,12 +7,19 @@ import java.util.List; import javax.annotation.Resource; import cn.hutool.core.bean.BeanUtil; -import com.glxp.api.dao.basic.ProductInfoDao; -import com.glxp.api.dao.basic.UdiCompanyDao; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import com.glxp.api.dao.basic.*; import com.glxp.api.dao.inout.*; +import com.glxp.api.dao.purchase.*; +import com.glxp.api.entity.basic.BasicProductsEntity; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.basic.UdiCompanyEntity; import com.glxp.api.entity.inout.*; +import com.glxp.api.entity.purchase.SupManufacturerEntity; import com.glxp.api.res.sync.*; import com.glxp.api.service.inout.*; import lombok.extern.slf4j.Slf4j; @@ -34,12 +41,31 @@ import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.sync.SpsSyncDataRequest; +import com.glxp.api.res.sync.*; +import com.glxp.api.service.basic.BasicHospTypeService; +import com.glxp.api.service.inout.*; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.session.SqlSessionFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; import cn.hutool.core.collection.CollUtil; +import org.springframework.transaction.annotation.Isolation; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + @Slf4j @Service +@RequiredArgsConstructor public class HeartService { @Resource BasicExportService basicExportService; @@ -493,6 +519,81 @@ public class HeartService { } + private final BasicHospTypeDao basicHospTypeDao; + private final UdiRelevanceDao udiRelevanceDao; + private final BasicProductsDao basicProductsDao; + private final CompanyProductRelevanceDao relevanceDao; + private final BasicCorpDao corpDao; + private final SupCertDao supCertDao; + private final SupCertSetDao supCertSetDao; + private final SupCompanyDao supCompanyDao; + private final SupManufacturerDao supManufacturerDao; + private final SupProductDao supProductDao; + + /** + * 从UDI自助平台拉取基础数据 + */ + @Transactional(rollbackFor = Exception.class) + public void pullBasicData() { + String data = spGetHttp.pullBasicData(); + cn.hutool.json.JSONObject obj = JSONUtil.parseObj(data); + SpsSyncBasicDataResponse bean = obj.get("data", SpsSyncBasicDataResponse.class); + this.insertBasicData(bean); + String taskId = obj.getStr("taskId"); + BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); + basicDownloadStatusEntity.setId(CustomUtil.getId()); + basicDownloadStatusEntity.setTaskId(taskId); + basicDownloadStatusEntity.setStartTime(new Date()); + basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_BASIC_DATA); + basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); //下载完成 + basicDownloadStatusEntity.setType(BasicProcessStatus.BASIC_DATA); + basicDownloadStatusEntity.setScheduleType(1); + basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); + if (StrUtil.isNotBlank(taskId)) { + //通知自助平台任务已完成 + spGetHttp.finishTask(taskId); + } + } + + /** + * 设置嵌套事物 + * + * @param bean + */ + @Transactional(propagation = Propagation.NESTED) + public void insertBasicData(SpsSyncBasicDataResponse bean) { + if (CollectionUtil.isNotEmpty(bean.getHospTypeList())) { + basicHospTypeDao.insertOrUpdateBatch(bean.getHospTypeList()); + } + if (CollectionUtil.isNotEmpty(bean.getUdiRelevanceList())) { + udiRelevanceDao.insertOrUpdateBatch(bean.getUdiRelevanceList()); + } + if (CollectionUtil.isNotEmpty(bean.getProductsList())) { + basicProductsDao.insertOrUpdateBatch(bean.getProductsList()); + } + if (CollectionUtil.isNotEmpty(bean.getRelevanceList())) { + relevanceDao.insertOrUpdateBatch(bean.getRelevanceList()); + } + if (CollectionUtil.isNotEmpty(bean.getCorpList())) { + corpDao.insertOrUpdateBatch(bean.getCorpList()); + } + if (CollectionUtil.isNotEmpty(bean.getSupCertList())) { + supCertDao.insertOrUpdateBatch(bean.getSupCertList()); + } + if (CollectionUtil.isNotEmpty(bean.getSupCertSetList())) { + supCertSetDao.insertOrUpdateBatch(bean.getSupCertSetList()); + } + if (CollectionUtil.isNotEmpty(bean.getSupCompanyList())) { + supCompanyDao.insertOrUpdateBatch(bean.getSupCompanyList()); + } + if (CollectionUtil.isNotEmpty(bean.getSupManufacturerList())) { + supManufacturerDao.insertOrUpdateBatch(bean.getSupManufacturerList()); + } + if (CollectionUtil.isNotEmpty(bean.getSupProductList())) { + supProductDao.insertOrUpdateBatch(bean.getSupProductList()); + } + } + public void insetOrderDb(SpsSyncOrderResponse syncDataResponse, IoOrderEntity orderEntity) { //更新码详情 if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailCodeEntities())) { diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index d7a13dec7..dee034dcb 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -65,14 +65,17 @@ public class SyncHeartTask implements SchedulingConfigurer { lastTime1 = System.currentTimeMillis(); redisUtil.set("SPS_SYNC_UPLOAD_DATA", lastTime1); } - if (curTime1 - lastTime1 > timeInterval1) { - heartService.uploadAllBus(null); - heartService.uploadAllUserData(null); -// heartService.uploadScheduleList(); - heartService.uploadThrData(null); - heartService.uploadThrProducts(null); - heartService.uploadSysSetting(null); - redisUtil.set("SPS_SYNC_UPLOAD_DATA", curTime1); + try { + if (curTime1 - lastTime1 > timeInterval1) { + heartService.uploadAllBus(null); + heartService.uploadAllUserData(null); + // heartService.uploadScheduleList(); + heartService.uploadThrData(null); + heartService.uploadThrProducts(null); + heartService.uploadSysSetting(null); + redisUtil.set("SPS_SYNC_UPLOAD_DATA", curTime1); + } + } catch (Exception e) { } @@ -101,6 +104,7 @@ public class SyncHeartTask implements SchedulingConfigurer { } if (curTime - lastTime > timeInterval) { heartService.dlAllOrder(); + heartService.pullBasicData(); redisUtil.set("SPS_SYNC_DOWNLOAD_DATA", curTime); } diff --git a/src/main/java/com/glxp/api/util/OkHttpCli.java b/src/main/java/com/glxp/api/util/OkHttpCli.java index 7821a73c2..25bc943a1 100644 --- a/src/main/java/com/glxp/api/util/OkHttpCli.java +++ b/src/main/java/com/glxp/api/util/OkHttpCli.java @@ -171,6 +171,7 @@ public class OkHttpCli { } } catch (Exception e) { log.error(ExceptionUtils.getStackTrace(e)); + throw new RuntimeException(e); } finally { if (response != null) { response.close(); From bf675bc6dfe59ec3da2c50b39441d6b6c652b576 Mon Sep 17 00:00:00 2001 From: chengqf <584883665@139.com> Date: Tue, 18 Apr 2023 21:02:19 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/idc/service/impl/FileServiceImpl.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java index 0662b163d..a7ec54312 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java @@ -89,7 +89,6 @@ public class FileServiceImpl implements FileService { if(!isExists) return ResultVOUtils.error(9999,filePath + filePathSlash + imagePath + strs[0]); String result = relayFile(files,host); - logger.error(result); if (IDCUtils.isJson(result)) { BaseResponse baseResponse = JSON.parseObject(result,BaseResponse.class); return baseResponse; @@ -106,14 +105,17 @@ public class FileServiceImpl implements FileService { if(map!=null&&map.get("syncIp")!=null) { String result = IDCUtils.post(map.get("syncIp").toString()+"/spssync/file/downloadFile", params); - JSONObject object = JSON.parseObject(result); boolean success = false; - if(object.getInteger("code")==20000) { - String[] files = params.get("fileName").toString().split(","); - success = true; - for(String str:files) { - if(!idcService.signleDownloadFile(map.get("syncIp").toString(), str)) - success = false; + if(IDCUtils.isJson(result)) { + JSONObject object = JSON.parseObject(result); + + if(object.getInteger("code")==20000) { + String[] files = params.get("fileName").toString().split(","); + success = true; + for(String str:files) { + if(!idcService.signleDownloadFile(map.get("syncIp").toString(), str)) + success = false; + } } } if(!success) @@ -216,7 +218,6 @@ public class FileServiceImpl implements FileService { try { Response response = client.newCall(req).execute(); result = response.body().string(); - logger.info("result--->" + result); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); From 987a69591c0fbbb76a4825d0f240dee6f8ad3b89 Mon Sep 17 00:00:00 2001 From: chengqf <584883665@139.com> Date: Tue, 18 Apr 2023 21:03:19 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java index a7ec54312..deaa2d4d4 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java @@ -229,7 +229,6 @@ public class FileServiceImpl implements FileService { return result; } - @Override public BaseResponse downloadFile(HttpServletRequest request,Map params) { String host = ""; From a9d19e0f477dc1bc9e9edb4af005a6be8ef28877 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Wed, 19 Apr 2023 09:41:39 +0800 Subject: [PATCH 04/17] =?UTF-8?q?entity=E5=A2=9E=E5=8A=A0=E8=A1=A8?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index f397a2c4e..82f2afa8a 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -1,5 +1,6 @@ package com.glxp.api.entity.basic; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @@ -9,6 +10,7 @@ import java.util.Date; */ @Data +@TableName("udi_relevance") public class UdiRelevanceEntity { private Long id; From 31a875afae88ba04d04e74b0468b7218bef4308f Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 19 Apr 2023 09:44:11 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/res/sync/BaseSyncResponse.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/glxp/api/res/sync/BaseSyncResponse.java b/src/main/java/com/glxp/api/res/sync/BaseSyncResponse.java index 3f05c8f1c..ce5cd1422 100644 --- a/src/main/java/com/glxp/api/res/sync/BaseSyncResponse.java +++ b/src/main/java/com/glxp/api/res/sync/BaseSyncResponse.java @@ -9,6 +9,7 @@ public class BaseSyncResponse { private String taskId; private List files; + private List uploadFiles; private String updateTime; } From 929ad3718a63ad1dc6f1bc663dde9adbba5ae44c Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Wed, 19 Apr 2023 09:47:07 +0800 Subject: [PATCH 06/17] =?UTF-8?q?entity=E5=A2=9E=E5=8A=A0=E8=A1=A8?= =?UTF-8?q?=E5=90=8D=20=E5=AD=97=E6=AE=B5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/entity/basic/UdiRelevanceEntity.java | 145 ++++++++++++++++-- 1 file changed, 135 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index 82f2afa8a..371b2e711 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -1,5 +1,8 @@ package com.glxp.api.entity.basic; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -10,40 +13,162 @@ import java.util.Date; */ @Data -@TableName("udi_relevance") +@TableName("basic_udirel") public class UdiRelevanceEntity { + @TableId(value = "id", type = IdType.INPUT) private Long id; + + /** + * 字典UUID + */ + @TableField(value = "uuid") private String uuid; + + /** + * 第三方主系统产品ID + */ + @TableField(value = "mainId") private String mainId; + + /** + * 第三方产品ID + */ + @TableField(value = "thirdId") private String thirdId; + + /** + * 第三方产品ID1 + */ + @TableField(value = "thirdId1") private String thirdId1; + + /** + * 第三方产品ID2 + */ + @TableField(value = "thirdId2") private String thirdId2; + + /** + * 第三方产品ID3 + */ + @TableField(value = "thirdId3") private String thirdId3; + + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId4") private String thirdId4; + + /** + * 阳光采购平台编码 + */ + @TableField(value = "udplatCode") private String udplatCode; + + /** + * 是否以使用单元入库 + */ + @TableField(value = "isUseDy") private Boolean isUseDy; + + /** + * 是否禁用 + */ + @TableField(value = "isDisable") private Boolean isDisable; + + /** + * 是否锁定，锁定后不能再继续编辑 + */ + @TableField(value = "isLock") private Boolean isLock; + + /** + * 1.未提交，2.已提交，3.已锁定 + */ + @TableField(value = "lockStatus") private Integer lockStatus; + + /** + * 是否寄售（预入库) + */ + @TableField(value = "isAdavence") private Boolean isAdavence; + + /** + * 是否允许多次使用出库 + */ + @TableField(value = "useMuti") private Boolean useMuti; + + /** + * 最小包装单元可使用次数 + */ + @TableField(value = "useNum") private Integer useNum; + + /** + * 过滤供应商用 + */ + @TableField(value = "supName") private String supName; + + /** + * 创建时间 + */ + @TableField(value = "createTime") private Date createTime; + + @TableField(value = "overStockNum") + private Integer overStockNum; + @TableField(value = "recentDateTime") + private Integer recentDateTime; + + @TableField(value = "lowStockNum") + private Integer lowStockNum; + + @TableField(value = "relCode") + private String relCode; + /** + * 最後更新時間 + */ + @TableField(value = "updateTime") private Date updateTime; + + /** + * 修改时间 + */ + @TableField(value = "modifyTime") private Date modifyTime; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") private String createUser; - private String updateUser; - private String remark; - private Integer lowStockNum; - private Integer overStockNum; - private Integer recentDateTime; + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + @TableField(value = "remark") + private String remark; + @TableField(value = "useExpireTime") private Integer useExpireTime; - private boolean dispatch; //是否可配送 - private boolean groupBuy; //是否集采产品 - private String relCode; + @TableField(value = "dispatch") + private boolean dispatch; + @TableField(value = "groupBuy") //是否可配送 + private boolean groupBuy; + //是否集采产品 + @TableField(value = "isDateBy") private Integer isDateBy; -} + @TableField(value = "needCert") + private boolean needCert; //是否需要资质材料 + + @TableField(value = "certIdFk") + private String certIdFk; +} \ No newline at end of file From 558eef6aff457aabb0d4f872d2759cdb0dda4f16 Mon Sep 17 00:00:00 2001 From: chengqf <584883665@139.com> Date: Wed, 19 Apr 2023 10:07:20 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E4=B8=8A=E4=BC=A0=EF=BC=8C=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/idc/service/FileService.java | 3 + .../api/idc/service/impl/FileServiceImpl.java | 60 ++++++++++++++++--- 2 files changed, 54 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/glxp/api/idc/service/FileService.java b/src/main/java/com/glxp/api/idc/service/FileService.java index d02833345..ca6d3bdd4 100644 --- a/src/main/java/com/glxp/api/idc/service/FileService.java +++ b/src/main/java/com/glxp/api/idc/service/FileService.java @@ -1,5 +1,6 @@ package com.glxp.api.idc.service; +import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -11,6 +12,8 @@ import com.glxp.api.common.res.BaseResponse; /*文件服务*/ public interface FileService { + BaseResponse upload(List list); + BaseResponse download(List list); BaseResponse fileUpload(HttpServletRequest request,Map params); BaseResponse fileDownload(HttpServletRequest request,Map params); BaseResponse downloadFile(HttpServletRequest request,Map params); diff --git a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java index deaa2d4d4..49bedb789 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java @@ -4,6 +4,8 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -52,8 +54,27 @@ public class FileServiceImpl implements FileService { @Resource private IdcService idcService; private String imagePath = "register/file/image2/"; + + @Override + public BaseResponse upload(List list) { + return fileToUpload(list); + } + @Override + public BaseResponse download(List list) { + return fileToDownload(list); + } + @Override public BaseResponse fileUpload(HttpServletRequest request,Map params) { + List list = new ArrayList<>(); + String[] strs = params.get("fileName").toString().split(","); + for(String str:strs) { + list.add(str); + } + return fileToUpload(list); + } + + private BaseResponse fileToUpload(List list) { String host=""; try { Map map = dbDao.get("select * from sync_data_set limit 1"); @@ -73,21 +94,26 @@ public class FileServiceImpl implements FileService { } if(StringUtils.isEmpty(host)) return ResultVOUtils.error(9999,"上传地址未配置，请至同步设置中进行设置"); - if(params.get("fileName")!=null) { - String fileName = params.get("fileName").toString(); - String[] strs = fileName.split(","); + if(list!=null) { + + String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/"; ArrayList files = new ArrayList<>(); boolean isExists = true; - for(String str:strs) { - if (!StringUtils.isEmpty(str) && FileUtils.isFileExist(filePath + filePathSlash + imagePath + str)) { - files.add(filePath + filePathSlash + imagePath + str); - } else { - isExists = false; + List noExitsList = new ArrayList<>(); + for(String strs:list) { + String[] str = strs.split(","); + for(String s:str) { + if (!StringUtils.isEmpty(s) && FileUtils.isFileExist(filePath + filePathSlash + imagePath + s)) { + files.add(filePath + filePathSlash + imagePath + s); + } else { + isExists = false; + noExitsList.add(s); + } } } if(!isExists) - return ResultVOUtils.error(9999,filePath + filePathSlash + imagePath + strs[0]); + return ResultVOUtils.error(9999,"以下文件不存在:\n"+JSON.toJSONString(noExitsList)); String result = relayFile(files,host); if (IDCUtils.isJson(result)) { BaseResponse baseResponse = JSON.parseObject(result,BaseResponse.class); @@ -101,6 +127,22 @@ public class FileServiceImpl implements FileService { @Override public BaseResponse fileDownload(HttpServletRequest request,Map params) { + List list = new ArrayList<>(); + String[] strs = params.get("fileName").toString().split(","); + for(String str:strs) { + list.add(str); + } + return fileToDownload(list); + } + + + private BaseResponse fileToDownload(List list) { + Map params = new HashMap(); + String fileName = ""; + for(String str:list) { + fileName +=fileName.length()>0 ? ","+str : str; + } + params.put("fileName", fileName); Map map = dbDao.get("select * from sync_data_set limit 1"); if(map!=null&&map.get("syncIp")!=null) { From 5d0a562056e69e130d9607518c74eb177051d454 Mon Sep 17 00:00:00 2001 From: chengqf <584883665@139.com> Date: Wed, 19 Apr 2023 10:08:44 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=EF=BC=8C=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/idc/service/FileService.java | 2 +- .../java/com/glxp/api/idc/service/impl/FileServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/idc/service/FileService.java b/src/main/java/com/glxp/api/idc/service/FileService.java index ca6d3bdd4..a0e7115a8 100644 --- a/src/main/java/com/glxp/api/idc/service/FileService.java +++ b/src/main/java/com/glxp/api/idc/service/FileService.java @@ -10,7 +10,7 @@ import org.springframework.web.multipart.MultipartFile; import com.glxp.api.common.res.BaseResponse; -/*文件服务*/ +/*文件服务*/ public interface FileService { BaseResponse upload(List list); BaseResponse download(List list); diff --git a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java index 49bedb789..133713524 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java @@ -38,7 +38,7 @@ import okhttp3.RequestBody; import okhttp3.Response; -/*连通检测*/ +/*文件服务*/ @Service public class FileServiceImpl implements FileService { private static final Logger logger = LoggerFactory.getLogger(FileServiceImpl.class); From 1fec249ff67bf97ff0e7a2fa7b8bac5d34330f1e Mon Sep 17 00:00:00 2001 From: chengqf <584883665@139.com> Date: Wed, 19 Apr 2023 10:12:01 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=EF=BC=8C=E4=B8=8B=E8=BD=BD=E5=90=8E=E5=8F=B0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/idc/service/impl/FileServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java index 133713524..66a801ddf 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java @@ -38,7 +38,7 @@ import okhttp3.RequestBody; import okhttp3.Response; -/*文件服务*/ +/*文件服务*/ @Service public class FileServiceImpl implements FileService { private static final Logger logger = LoggerFactory.getLogger(FileServiceImpl.class); From d3e6df86235daa5ff2db0d039c4c0b0424cf9ab3 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Wed, 19 Apr 2023 10:44:15 +0800 Subject: [PATCH 10/17] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/dao/basic/BasicCorpDao.java | 3 +-- .../basic/impl/BasicCorpServiceImpl.java | 3 +-- .../glxp/api/service/sync/HeartService.java | 23 +++++++++++-------- .../mybatis/mapper/basic/BasicCorpDao.xml | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java index 3a2b2135b..879d5438f 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -4,7 +4,6 @@ package com.glxp.api.dao.basic; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -21,7 +20,7 @@ public interface BasicCorpDao extends BaseMapperPlus0?true:false; + return basicCorpDao.customUpdateById(basicUnitMaintainSaveRequest)>0?true:false; } @Override diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 39ad7a5bc..11acbdc71 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -539,17 +539,20 @@ public class HeartService { cn.hutool.json.JSONObject obj = JSONUtil.parseObj(data); SpsSyncBasicDataResponse bean = obj.get("data", SpsSyncBasicDataResponse.class); this.insertBasicData(bean); - String taskId = obj.getStr("taskId"); - BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); - basicDownloadStatusEntity.setId(CustomUtil.getId()); - basicDownloadStatusEntity.setTaskId(taskId); - basicDownloadStatusEntity.setStartTime(new Date()); - basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_BASIC_DATA); - basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); //下载完成 - basicDownloadStatusEntity.setType(BasicProcessStatus.BASIC_DATA); - basicDownloadStatusEntity.setScheduleType(1); - basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); + String taskId = bean.getTaskId(); if (StrUtil.isNotBlank(taskId)) { + //插入下载记录 + BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); + basicDownloadStatusEntity.setId(CustomUtil.getId()); + basicDownloadStatusEntity.setTaskId(taskId); + basicDownloadStatusEntity.setStartTime(new Date()); + basicDownloadStatusEntity.setUpdateTime(new Date()); + basicDownloadStatusEntity.setEndTime(new Date()); + basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_BASIC_DATA); + basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); //下载完成 + basicDownloadStatusEntity.setType(BasicProcessStatus.BASIC_DATA); + basicDownloadStatusEntity.setScheduleType(1); + basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); //通知自助平台任务已完成 spGetHttp.finishTask(taskId); } diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index 4396473f6..9dcb7e49a 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -171,7 +171,7 @@ - + UPDATE basic_corp thirdId=#{thirdId}, From abbc13b2f574ceb6e3551e1e8954f3c9b75c8cb2 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 19 Apr 2023 10:48:37 +0800 Subject: [PATCH 11/17] =?UTF-8?q?1.=E5=90=88=E5=B9=B6=E8=87=AA=E5=8A=A9?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inv/InvRemindSetController.java | 32 ++++++++++++++ .../req/inv/FilterInvRemindSetRequest.java | 10 +++++ .../inv/impl/InvRemindSetServiceImpl.java | 25 ++++++++++- .../mybatis/mapper/inv/InvRemindSetDao.xml | 44 +++++++++++-------- src/main/resources/schemas/schema_v2.1.sql | 2 + 5 files changed, 93 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java b/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java index a1f3e0d72..db65bf9b7 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java @@ -1,10 +1,13 @@ package com.glxp.api.controller.inv; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inv.InvRemindSetEntity; import com.glxp.api.req.inv.AddInvRemindSetRequest; import com.glxp.api.req.inv.FilterInvRemindSetRequest; @@ -79,4 +82,33 @@ public class InvRemindSetController { return invRemindSetService.deleteInvRemindSet(Integer.valueOf(deleteRequest.getId())); } + /** + * 批量添加库存预警设置 + * + * @param addInvRemindSetRequest + * @return + */ + @PostMapping("/udiwms/inv/remind/set/batchAddInvRemindSet") + @Log(title = "库存预警", businessType = BusinessType.INSERT) + public BaseResponse batchAddInvRemindSet(@RequestBody AddInvRemindSetRequest addInvRemindSetRequest) { + if (null == addInvRemindSetRequest || CollUtil.isEmpty(addInvRemindSetRequest.getRelIdList())) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + return invRemindSetService.batchAddInvRemindSet(addInvRemindSetRequest); + } + + /** + * 通过库存ID查询生成库存预警设置的信息 + * + * @param invId + * @return + */ + @GetMapping("/udiwms/inv/remind/set/getInfoByInvId") + public BaseResponse getInfoByInvId(FilterInvRemindSetRequest filterInvRemindSetRequest) { + if (null == filterInvRemindSetRequest || null == filterInvRemindSetRequest.getInvId()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + return invRemindSetService.getInfoByInvId(filterInvRemindSetRequest.getInvId()); + } + } diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvRemindSetRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvRemindSetRequest.java index d50a19ba4..64a76c6a4 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvRemindSetRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvRemindSetRequest.java @@ -24,4 +24,14 @@ public class FilterInvRemindSetRequest extends ListPageRequest { */ private String invSpaceCode; + /** + * 库存ID + */ + private Integer invId; + + /** + * 状态 0：未启用 1：已启用 + */ + private Integer status; + } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java index d9bf72170..1d9d24b73 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java @@ -52,7 +52,16 @@ public class InvRemindSetServiceImpl implements InvRemindSetService { if (null != filterInvRemindSetRequest.getPage() && null != filterInvRemindSetRequest.getLimit()) { PageHelper.offsetPage((filterInvRemindSetRequest.getPage() - 1) * filterInvRemindSetRequest.getLimit(), filterInvRemindSetRequest.getLimit()); } - return invRemindSetDao.filterList(filterInvRemindSetRequest); + List list = invRemindSetDao.filterList(filterInvRemindSetRequest); + if (CollUtil.isNotEmpty(list)) { + list.forEach(invRemindSetResponse -> { + if (invRemindSetResponse.getIsDateBy() == 1 && null != invRemindSetResponse.getRecentDateTime()) { + //将近效期预警值由小时换算成天 + invRemindSetResponse.setRecentDateTime(invRemindSetResponse.getRecentDateTime() / 24); + } + }); + } + return list; } @Override @@ -115,6 +124,20 @@ public class InvRemindSetServiceImpl implements InvRemindSetService { public BaseResponse getInfoByInvId(Integer invId) { InvRemindSetResponse response = invRemindSetDao.selectInfoByInvId(invId); if (null != response) { + //查询是否已有库存预警设置信息，若已存在预警设置，则回显旧数据 + InvRemindSetEntity invRemindSetEntity = invRemindSetDao.selectOne(new QueryWrapper() + .eq("deptCode", response.getDeptCode()) + .eq("invCode", response.getInvCode()) + .eq("relId", response.getRelId()) + ); + + if (null != invRemindSetEntity) { + response.setLackStock(invRemindSetEntity.getLackStock()); + response.setLowStock(invRemindSetEntity.getLowStock()); + response.setOverStock(invRemindSetEntity.getOverStock()); + response.setExpireDate(invRemindSetEntity.getExpireDate()); + response.setRecentDate(invRemindSetEntity.getRecentDate()); + } if (response.getIsDateBy() == 1 && null != response.getRecentDateTime()) { //将近效期预警值由小时换算成天 response.setRecentDateTime(response.getRecentDateTime() / 24); diff --git a/src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml b/src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml index 59ef66e35..8a9f6afee 100644 --- a/src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml @@ -13,6 +13,11 @@ irs.expireDate, irs.recentDate, irs.remark, + bu.lowStockNum, + bu.overStockNum, + bu.recentDateTime, + bu.useExpireTime, + bu.isDateBy, bp.cpmctymc productName, bp.ggxh, (select `name` from auth_warehouse where `code` = irs.invCode) invName, @@ -38,26 +43,27 @@ diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 81ebaad1b..68292a1e4 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -122,6 +122,7 @@ CALL Pro_Temp_ColumnWork('sup_product', 'allowNoProduct', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sup_product', 'allowNoSerial', 'tinyint', 1); CALL Pro_Temp_ColumnWork('inv_remind_msg', 'remindCount', 'int', 1); +CALL Pro_Temp_ColumnWork('inv_remind_set', 'status', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sup_cert_remind_msg', 'remindCount', 'int', 1); CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'orderStatus', 'tinyint', 1); @@ -166,6 +167,7 @@ CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_biz', 'updateTime', 'dateti CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_label', 'updateTime', 'datetime', 1); CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_statemen', 'updateTime', 'datetime', 1); + # CALL Pro_Temp_ColumnWork('sup_cert_set', 'foreign', 'tinyint', 3); # CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1); From 15848414a915e74f3c90b3c81cc6b7d757b5c281 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 19 Apr 2023 11:30:16 +0800 Subject: [PATCH 12/17] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=96=87=E4=BB=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/http/sync/SpGetHttpClient.java | 16 ++++- .../glxp/api/service/sync/HeartService.java | 68 +++++++++---------- 2 files changed, 49 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java index a0101a41b..20c7abd3f 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -1,6 +1,5 @@ package com.glxp.api.http.sync; -import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -302,4 +301,19 @@ public class SpGetHttpClient { }); return response; } + + /** + * 上传模板文件到中继服务 + * + * @param fileNameList + * @return + */ + public BaseResponse postTemplateFile(List> fileNameList) { + String json = JSONUtil.toJsonStr(fileNameList); + String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/file/download", json, buildHeader()); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } } diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 11acbdc71..162d00f69 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1,67 +1,43 @@ package com.glxp.api.service.sync; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.annotation.Resource; - import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.glxp.api.dao.basic.*; -import com.glxp.api.dao.inout.*; -import com.glxp.api.dao.purchase.*; -import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; -import com.glxp.api.entity.basic.ProductInfoEntity; -import com.glxp.api.entity.basic.UdiCompanyEntity; -import com.glxp.api.entity.inout.*; -import com.glxp.api.entity.purchase.SupManufacturerEntity; -import com.glxp.api.res.sync.*; -import com.glxp.api.service.inout.*; -import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.session.ExecutorType; -import org.apache.ibatis.session.SqlSession; -import org.apache.ibatis.session.SqlSessionFactory; -import org.apache.ibatis.session.TransactionIsolationLevel; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.dao.basic.*; +import com.glxp.api.dao.purchase.*; +import com.glxp.api.entity.basic.ProductInfoEntity; +import com.glxp.api.entity.basic.UdiCompanyEntity; +import com.glxp.api.entity.inout.*; import com.glxp.api.entity.sync.BasicDownloadStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.sync.SpsSyncDataRequest; import com.glxp.api.res.sync.*; -import com.glxp.api.service.basic.BasicHospTypeService; import com.glxp.api.service.inout.*; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.session.ExecutorType; +import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; +import org.apache.ibatis.session.TransactionIsolationLevel; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; - -import cn.hutool.core.collection.CollUtil; -import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; @Slf4j @Service @@ -770,6 +746,30 @@ public class HeartService { basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_SYS_SETTING); spsSyncSysSettingResponse.setTaskId(basicExportStatusEntity1.getId()); BaseResponse baseResponse = spGetHttp.postSysSetting(spsSyncSysSettingResponse); + //若模板记录不为空，则将模板文件同步过去 + String uploadFileLog = ""; + if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSystemPDFTemplateEntities())) { + List> list = new ArrayList<>(spsSyncSysSettingResponse.getSystemPDFTemplateEntities().size() * 2); + spsSyncSysSettingResponse.getSystemPDFTemplateEntities().forEach(systemPDFTemplateEntity -> { + //分切文件并封装参数 + Map pathFileMap = new HashMap<>(1); + pathFileMap.put("fileName", StrUtil.split(systemPDFTemplateEntity.getPath(), "template/").get(1)); + list.add(pathFileMap); + + Map jrxmlPathFileMap = new HashMap<>(1); + jrxmlPathFileMap.put("fileName", StrUtil.split(systemPDFTemplateEntity.getJrxmlPath(), "template/").get(1)); + list.add(jrxmlPathFileMap); + }); + + BaseResponse response = spGetHttp.postTemplateFile(list); + if (response.getCode() == 20000) { + log.info("模板文件列表上传成功"); + uploadFileLog = "\n模板文件列表上传成功"; + } else { + log.info("模板文件上传失败，响应信息：{}", response.getMessage()); + uploadFileLog = "\n模板文件列表上传失败，错误信息：" + response.getMessage(); + } + } if (baseResponse.getCode() == 20000) { basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); } else { @@ -778,7 +778,7 @@ public class HeartService { basicExportStatusEntity1.setEndTime(new Date()); basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); - basicExportStatusEntity1.setRemark(spsSyncSysSettingResponse.logs()); + basicExportStatusEntity1.setRemark(spsSyncSysSettingResponse.logs() + uploadFileLog); basicExportStatusEntity1.setUpdateTime(new Date()); basicExportService.updateExportStatus(basicExportStatusEntity1); return ResultVOUtils.success(); From e3c6399aa51992ca09f2ccc97272d872c8dce895 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 19 Apr 2023 13:55:16 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=B5=81=E8=BD=AC?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dao/basic/BasicBusTypePreDao.java | 4 +- .../entity/basic/BasicBusTypePreEntity.java | 5 + .../req/basic/BussinessTypeSaveRequest.java | 1 - .../basic/IBasicBusTypePreService.java | 3 - .../impl/BasicBusTypePreServiceImpl.java | 5 - .../service/inout/IoChangeInoutService.java | 26 +++-- .../service/inout/IoCheckInoutService.java | 16 +-- .../com/glxp/api/task/AsyncFetchUdiTask.java | 4 +- .../java/com/glxp/api/task/AsyncUdiTask.java | 4 +- .../java/com/glxp/api/task/SyncHeartTask.java | 4 +- .../glxp/api/util/udi/UdiCalCountUtil.java | 4 +- .../mapper/basic/BasicBusTypePreDao.xml | 86 ++++++++++++++++ .../mapper/thrsys/ThrInvProductsDao.xml | 4 +- src/main/resources/schemas/schema_v2.1.sql | 97 ++++++++++++++++++- 14 files changed, 223 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java index c7be7d40a..72ff84fb9 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java @@ -42,4 +42,6 @@ public interface BasicBusTypePreDao extends BaseMapperPlus selectBusTypePreResList(FilterBusTypePreRequest filterBusTypePreRequest); -} \ No newline at end of file + boolean insertOrUpdate(BasicBusTypePreEntity record); + +} diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java index c81ca2e11..673757866 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java @@ -123,6 +123,11 @@ public class BasicBusTypePreEntity { @TableField(value = "remark") private String remark; +// 创建单模式：1：送货至入库单模式；2.向上级补单模式；3.预验收/寄售转入库单模式 + + @TableField(value = "createType") + private int createType; + /** * 目标业务单 diff --git a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java index b5496efb0..c301844ac 100644 --- a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java @@ -294,7 +294,6 @@ public class BussinessTypeSaveRequest { private boolean fillCodeRel; - private boolean checkVailDate; private boolean checkExpire; private boolean checkCertExpire; diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index 3822a371d..8c3aa4c01 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -5,7 +5,6 @@ import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBusTypePreRequest; import com.glxp.api.res.basic.BasicBusTypePreResponse; -import java.util.Date; import java.util.List; /** @@ -80,6 +79,4 @@ public interface IBasicBusTypePreService { * @return */ boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity); - - List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 1fb71d32e..2b898f0d9 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -105,11 +105,6 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { return false; } - @Override - public List findByLastTime(Date lastUpdateTime) { - return basicBusTypePreDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); - } - /** * 设置创建/更新信息 * diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index e64170fb4..9aa37fe0c 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -190,15 +190,27 @@ public class IoChangeInoutService { String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(targetBustypeEntity.getPrefix()), "yyyyMMdd")); outOrder.setBillNo(orderNo); - if (targetBustypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { + if (bussinessChangeTypeEntity.getCreateType() == 1) {//送货至入库补单 outOrder.setCustomerId(corpName); outOrder.setFromCorp(corpName); outOrder.setFromInvCode(null); outOrder.setFromDeptCode(null); + } else if (bussinessChangeTypeEntity.getCreateType() == 3) { //寄售、预验收补单 + if (targetBustypeEntity.getActionType() == 2) { + outOrder.setCustomerId(null); + outOrder.setFromCorp(null); + InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode("1000001"); + outOrder.setFromInvCode(invWarehouseEntity.getCode()); + outOrder.setFromDeptCode(invWarehouseEntity.getParentId()); + } else if (targetBustypeEntity.getActionType() == 3) { + outOrder.setCustomerId(null); + outOrder.setFromCorp(null); + InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode("1000002"); + outOrder.setFromInvCode(invWarehouseEntity.getCode()); + outOrder.setFromDeptCode(invWarehouseEntity.getParentId()); + } } else { outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID); - - InvWarehouseEntity curInv = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode()); InvWarehouseEntity upInv = invWarehouseService.findByInvSubByCode(curInv.getParentCode()); outOrder.setFromInvCode(upInv.getCode()); @@ -217,13 +229,7 @@ public class IoChangeInoutService { InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode()); outOrder.setInvCode(invWarehouseEntity.getCode()); outOrder.setDeptCode(invWarehouseEntity.getParentId()); - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit"); - if ("1".equals(systemParamConfigEntity.getParamValue())) { - outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); - } else { - outOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL); - } - + outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); //互填单号 orderEntity.setUllageSupNo(outOrder.getBillNo()); orderEntity.setUpdateTime(new Date()); diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 6028d9056..ea2d67d78 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -265,13 +265,13 @@ public class IoCheckInoutService { orderDetailBizService.insert(orderDetailBizEntity); - //生成单据结果 - IoOrderDetailResultEntity orderDetailResultEntity = new IoOrderDetailResultEntity(); - BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailResultEntity); - orderDetailResultEntity.setCount(orderDetailCodeEntity.getReCount()); - orderDetailResultEntity.setReCount(orderDetailCodeEntity.getReCount()); - orderDetailResultEntity.setId(null); - orderDetailResultService.insert(orderDetailResultEntity); + //生成单据结果 + IoOrderDetailResultEntity orderDetailResultEntity = new IoOrderDetailResultEntity(); + BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailResultEntity); + orderDetailResultEntity.setCount(orderDetailCodeEntity.getReCount()); + orderDetailResultEntity.setReCount(orderDetailCodeEntity.getReCount()); + orderDetailResultEntity.setId(null); + orderDetailResultService.insert(orderDetailResultEntity); }); } @@ -812,6 +812,8 @@ public class IoCheckInoutService { }); } + + //校验是否是不入库存单据 if (bussinessTypeEntity.isInStock()) { //生成库存 diff --git a/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java b/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java index 3f49738f5..ccf16ef4d 100644 --- a/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java +++ b/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java @@ -16,8 +16,8 @@ import com.glxp.api.idc.service.IdcService; import com.glxp.api.req.system.ScheduledRequest; -@Component -@EnableScheduling +//@Component +//@EnableScheduling public class AsyncFetchUdiTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(AsyncFetchUdiTask.class); diff --git a/src/main/java/com/glxp/api/task/AsyncUdiTask.java b/src/main/java/com/glxp/api/task/AsyncUdiTask.java index 001d5a507..8db9661d4 100644 --- a/src/main/java/com/glxp/api/task/AsyncUdiTask.java +++ b/src/main/java/com/glxp/api/task/AsyncUdiTask.java @@ -16,8 +16,8 @@ import com.glxp.api.idc.service.IdcService; import com.glxp.api.req.system.ScheduledRequest; -@Component -@EnableScheduling +//@Component +//@EnableScheduling public class AsyncUdiTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(AsyncUdiTask.class); diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index dee034dcb..3b3ed6eea 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -18,8 +18,8 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; -@Component -@EnableScheduling +//@Component +//@EnableScheduling public class SyncHeartTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class); diff --git a/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java b/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java index aebc2833c..2270c94aa 100644 --- a/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java +++ b/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java @@ -21,14 +21,14 @@ public class UdiCalCountUtil { public int getActCount(UdiRelevanceResponse udiRelevanceResponse) { int actCount; - if (!udiRelevanceResponse.getUseDy() && udiRelevanceResponse.getDiType() != 2) { + if (!udiRelevanceResponse.getUseDy() && (udiRelevanceResponse.getDiType() == null || udiRelevanceResponse.getDiType() != 2)) { if (udiRelevanceResponse.getBhzxxsbzsl() == 0) { actCount = udiRelevanceResponse.getZxxsbzbhsydysl(); } else { if (udiRelevanceResponse.getBhzxxsbzsl() == 0) { udiRelevanceResponse.setBhzxxsbzsl(1); } - if (udiRelevanceResponse.getZxxsbzbhsydysl() == 0) { + if (udiRelevanceResponse.getZxxsbzbhsydysl() == null || udiRelevanceResponse.getZxxsbzbhsydysl() == 0) { udiRelevanceResponse.setZxxsbzbhsydysl(1); } actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl(); diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml index ee878512b..ef64d7378 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml @@ -61,4 +61,90 @@ + + + insert into basic_bustype_pre + + + id, + + intro, + `action`, + `index`, + beforeTime, + changeType, + defaultDeptCode, + defaultInvCode, + deptCode, + invCode, + originAction, + changeEnable, + supplementAll, + `createUser`, + updateUser, + createTime, + updateTime, + remark, + targetBusAction, + busBeforeTime, + auditStatus, + busAuditStatus,createType, + + values + + + #{id,jdbcType=INTEGER}, + + #{intro,jdbcType=VARCHAR}, + #{action,jdbcType=VARCHAR}, + #{index,jdbcType=TINYINT}, + #{beforeTime,jdbcType=INTEGER}, + #{changeType,jdbcType=TINYINT}, + #{defaultDeptCode,jdbcType=VARCHAR}, + #{defaultInvCode,jdbcType=VARCHAR}, + #{deptCode,jdbcType=VARCHAR}, + #{invCode,jdbcType=VARCHAR}, + #{originAction,jdbcType=VARCHAR}, + #{changeEnable,jdbcType=TINYINT}, + #{supplementAll,jdbcType=TINYINT}, + #{createUser,jdbcType=VARCHAR}, + #{updateUser,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}, + #{remark,jdbcType=VARCHAR}, + #{targetBusAction,jdbcType=VARCHAR}, + #{busBeforeTime,jdbcType=TINYINT}, + #{auditStatus,jdbcType=TINYINT}, + #{busAuditStatus,jdbcType=TINYINT}, #{createType,jdbcType=TINYINT}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + intro = #{intro,jdbcType=VARCHAR}, + `action` = #{action,jdbcType=VARCHAR}, + `index` = #{index,jdbcType=TINYINT}, + beforeTime = #{beforeTime,jdbcType=INTEGER}, + changeType = #{changeType,jdbcType=TINYINT}, + defaultDeptCode = #{defaultDeptCode,jdbcType=VARCHAR}, + defaultInvCode = #{defaultInvCode,jdbcType=VARCHAR}, + deptCode = #{deptCode,jdbcType=VARCHAR}, + invCode = #{invCode,jdbcType=VARCHAR}, + originAction = #{originAction,jdbcType=VARCHAR}, + changeEnable = #{changeEnable,jdbcType=TINYINT}, + supplementAll = #{supplementAll,jdbcType=TINYINT}, + `createUser` = #{createUser,jdbcType=VARCHAR}, + updateUser = #{updateUser,jdbcType=VARCHAR}, + createTime = #{createTime,jdbcType=TIMESTAMP}, + updateTime = #{updateTime,jdbcType=TIMESTAMP}, + remark = #{remark,jdbcType=VARCHAR}, + targetBusAction = #{targetBusAction,jdbcType=VARCHAR}, + busBeforeTime = #{busBeforeTime,jdbcType=TINYINT}, + auditStatus = #{auditStatus,jdbcType=TINYINT}, + busAuditStatus = #{busAuditStatus,jdbcType=TINYINT}, + createType = #{createType,jdbcType=TINYINT}, + + + diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml index 955b17265..0a44c4925 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml @@ -100,7 +100,7 @@ batchNo=#{batchNo}, warehouseName=#{warehouseName}, warehouseCode=#{warehouseCode}, - registerCertNo=#{registerCertNo}, + registerCertNo=#{registerCertNo},8 manufacturingDate=#{manufacturingDate}, expirationDate=#{expirationDate}, spaceCode=#{spaceCode}, @@ -124,4 +124,4 @@ WHERE id = #{id} - \ No newline at end of file + diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 68292a1e4..82ca826fa 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -10,6 +10,8 @@ CALL Pro_Temp_ColumnWork('io_order', 'processStatus', 'tinyint ', 1); CALL Pro_Temp_ColumnWork('io_order', 'suppleCount', 'tinyint ', 1); CALL Pro_Temp_ColumnWork('io_order', 'relKey', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('io_order', 'checkTime', 'datetime ', 1); +CALL Pro_Temp_ColumnWork('io_order', 'checkUser', 'varchar(255) ', 1); + CALL Pro_Temp_ColumnWork('io_code_lost', 'nameCode', 'varchar(255) ', 1); @@ -20,6 +22,10 @@ CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1) CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkFileName', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'int ', 1); +CALL Pro_Temp_ColumnWork('thr_products', 'updateUser', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('thr_products', 'createUser', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('thr_products', 'createTime', 'varchar(255) ', 1); + CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1); @@ -60,8 +66,8 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkExpire', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkCertExpire', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'preInBackAction', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'backPreinType', 'tinyint', 1); - - +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkPreInOrders', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'createType', 'tinyint', 1); CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'batchNo', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'productDate', 'varchar(255) ', 1); @@ -99,6 +105,17 @@ CALL Pro_Temp_ColumnWork('pur_order', 'supId', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('pur_order', 'arrivalTime', 'datetime', 1); CALL Pro_Temp_ColumnWork('pur_order', 'dealStatus', 'int', 1); +INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`, + `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`) +VALUES ('1541070754823692288', '1000000', '总库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 1, 1); +INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`, + `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`) +VALUES ('1541070754823692289', '1000002', '寄售库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 2, 1); +INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`, + `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`) +VALUES ('1541070754823692290', '1000001', '预验收库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 3, 1); + + CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1); CALL Pro_Temp_ColumnWork('inv_prein_detail', 'status', 'tinyint', 1); @@ -108,7 +125,6 @@ CALL Pro_Temp_ColumnWork('inv_prein_detail', 'originReCount', 'int', 1); CALL Pro_Temp_ColumnWork('inv_prein_detail', 'mainAction', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('inv_prein_detail', 'action', 'varchar(255)', 1); - CALL Pro_Temp_ColumnWork('io_code_lost', 'nameCode', 'varchar(255)', 1); INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, @@ -136,6 +152,8 @@ CALL Pro_Temp_ColumnWork('sys_pdf_template', 'bussinessStatus', 'varchar(255)', CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'filePath', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('io_order', 'checkStatus', 'tinyint', 1); + INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`) VALUES (100, 'clean_log_task', '0 0 2 1/1 * ? ', NULL, '删除日志数据'); @@ -153,6 +171,7 @@ CALL Pro_Temp_ColumnWork('auth_warehouse', 'updateTime', 'datetime ', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'basicType', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'basicDept', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'updateTime', 'datetime', 1); + CALL Pro_Temp_ColumnWork('sync_data_set', 'orderToInSyncTime', 'int', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'supCert', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'systemConfig', 'tinyint', 1); @@ -172,3 +191,75 @@ CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_statemen', 'updateTime', 'd # CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1); +CREATE TABLE IF NOT EXISTS `inv_prein_product` +( + `id` int NOT NULL AUTO_INCREMENT, + `relIdFk` bigint NULL DEFAULT NULL COMMENT '耗材字典ID', + `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '最小销售标识', + `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', + `productionDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', + `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', + `inCount` int NULL DEFAULT NULL COMMENT '入库数量', + `outCount` int NULL DEFAULT NULL COMMENT '出库数量', + `reCount` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '实际数量', + `customerId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '客户ID', + `supId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商ID', + `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '部门编码', + `invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '仓库编码', + `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci COMMENT = '预验收库存表' + ROW_FORMAT = DYNAMIC; + +SET FOREIGN_KEY_CHECKS = 1; + + + +CREATE TABLE IF NOT EXISTS `inv_prein_product_detail` +( + `id` int NOT NULL AUTO_INCREMENT, + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'UDI码', + `mainAction` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '出入单据类型', + `action` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '单据类型', + `orderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '订单号外键', + `relId` int NOT NULL COMMENT '耗材字典ID', + `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '最小销售标识', + `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', + `produceDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', + `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', + `serialNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号', + `supId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商', + `count` int NULL DEFAULT NULL COMMENT '扫码数量', + `reCount` int NULL DEFAULT NULL COMMENT '实际数量', + `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '部门编码', + `invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '仓库编码', + `invSpaceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '货位编码', + `purchaseType` tinyint NULL DEFAULT NULL COMMENT '采购类型', + `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci COMMENT = '预验收库存详情表' + ROW_FORMAT = DYNAMIC; + + +CREATE TABLE IF NOT EXISTS `sync_data_change_bustypes` +( + `id` int NOT NULL AUTO_INCREMENT, + `action` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, + `outChange` tinyint NULL DEFAULT NULL, + `orderStatus` tinyint NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 128 + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci COMMENT = '单据同步 - 业务单据类型' + ROW_FORMAT = DYNAMIC; + + + + From d175bf1e66c1be70a6fa819c005163e30f692d23 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 19 Apr 2023 14:28:35 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 24 +++++++++++++++++++ .../basic/IBasicBusTypePreService.java | 3 +++ .../impl/BasicBusTypePreServiceImpl.java | 4 ++++ 3 files changed, 31 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 9808c3522..14b58a248 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -264,9 +264,27 @@ public class InvWarehouseController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } + Integer userCount = warehouseUserService.countUserBySubInvCode(invWarehouseEntity.getCode()); + if (userCount > 0) { + return ResultVOUtils.error(500, "修改失败,请先移除该仓库关联用户！"); + } + //更新仓库信息 + invWarehouseEntity.setUpdateTime(new Date()); boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity); + //如果要是一级仓库就吧全部子集都刷成一样的寄售仓库 + if(StrUtil.isBlank(invWarehouseEntity.getParentCode())){ + List invWarehouseEntityList=invWarehouseService.selectLowWarehouseAll(invWarehouseEntity.getCode()); + for (InvWarehouseEntity obj : invWarehouseEntityList) { + obj.setAdvanceType(invWarehouseEntity.getAdvanceType()); + obj.setUpdateTime(new Date()); + invWarehouseService.updateInvSubWarehouse(obj); + } + } + + + //更新部门信息 DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId()); pEntity.setUpdateTime(new Date()); @@ -610,4 +628,10 @@ public class InvWarehouseController extends BaseController { return ResultVOUtils.success(); } + @PostMapping("/warehouse/inout/getDeptById") + public BaseResponse getDeptById(@RequestBody List deptIds) { + List list = deptService.getDeptById(deptIds); + return ResultVOUtils.success(list); + } + } diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index 8c3aa4c01..3822a371d 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -5,6 +5,7 @@ import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBusTypePreRequest; import com.glxp.api.res.basic.BasicBusTypePreResponse; +import java.util.Date; import java.util.List; /** @@ -79,4 +80,6 @@ public interface IBasicBusTypePreService { * @return */ boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity); + + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 2b898f0d9..856aad5a2 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -105,6 +105,10 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { return false; } + @Override + public List findByLastTime(Date lastUpdateTime) { + return basicBusTypePreDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } /** * 设置创建/更新信息 * From 76994ae9f54fb442d1438cac31b40116b2b20d56 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 19 Apr 2023 14:36:45 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E7=94=9F=E6=88=90=E4=B8=9A=E5=8A=A1=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=8D=95=E7=AD=89=E4=BF=AE=E6=94=B9=E8=BF=81?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/IoPurChangeService.java | 6 +-- .../api/dao/basic/BasicBusTypeChangeDao.java | 3 +- .../glxp/api/dao/inout/ReceiveDetailDao.java | 4 +- .../res/basic/BasicBusTypeChangeResponse.java | 3 ++ .../basic/IBasicBusTypeChangeService.java | 1 - .../basic/IBasicBusTypePreService.java | 3 ++ .../impl/BasicBusTypeChangeServiceImpl.java | 1 - .../impl/BasicBusTypePreServiceImpl.java | 5 ++ .../api/service/inout/ReceiveService.java | 4 ++ .../service/inout/ReceivedetailService.java | 3 +- .../inout/impl/ReceiveDetailServiceImpl.java | 6 ++- .../inout/impl/ReceiveServiceImpl.java | 9 ++-- .../mapper/basic/BasicBusTypeChangeDao.xml | 9 ++-- .../mybatis/mapper/inout/ReceiveDetailDao.xml | 54 ++++++++++++++----- 14 files changed, 83 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java index 0c5a048d8..7317cd49c 100644 --- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java +++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java @@ -275,7 +275,7 @@ public class IoPurChangeService { billNo += ioOrderEntity.getBillNo() + ","; //插入业务单表 for (PurReceiveDetailEntity obj : m.getValue()) { - BasicProductsEntity basicProductsEntity = purPlanDetailService.selectIoOrderDetailBiz(obj.getId()); + BasicProductsEntity basicProductsEntity = receivedetailService.selectIoOrderDetailBiz(obj.getId()); IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo()); ioOrderDetailBizEntity.setBindRlFk(obj.getRelIdFk()); @@ -436,10 +436,10 @@ public class IoPurChangeService { ioOrderEntity.setAction(basicBusTypeChangeEntity.getTargetAction()); ioOrderEntity.setFromCorp(m.getKey()); ioOrderEntity.setFromType(ConstantStatus.FROM_Order); - if(basicBusTypeChangeEntity.getAuditStatus()==1){ + if (basicBusTypeChangeEntity.getAuditStatus() == 1) { ioOrderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); ioOrderEntity.setDealStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); - }else if(basicBusTypeChangeEntity.getAuditStatus()==2){ + } else if (basicBusTypeChangeEntity.getAuditStatus() == 2) { ioOrderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK); ioOrderEntity.setDealStatus(ConstantStatus.ORDER_STATUS_PROCESS); } diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java index 652a0b2bd..088aefdfd 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java @@ -21,4 +21,5 @@ public interface BasicBusTypeChangeDao extends BaseMapper filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest); -} \ No newline at end of file + +} diff --git a/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java b/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java index c0258375d..ffaf2e573 100644 --- a/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java @@ -1,12 +1,14 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.req.inout.FilterReceiveDetailRequest; import com.glxp.api.req.inout.UpdateReceiveDetailRequest; import com.glxp.api.res.inout.ReceiveDetailResponse; import com.glxp.api.res.inout.ReceiveResponse; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,5 +19,5 @@ public interface ReceiveDetailDao extends BaseMapperPlus findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java index a37faad5a..7812a8b36 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicBusTypeChangeDao; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.res.basic.BasicBusTypeChangeResponse; import com.glxp.api.service.auth.CustomerService; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 2b898f0d9..1fb71d32e 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -105,6 +105,11 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { return false; } + @Override + public List findByLastTime(Date lastUpdateTime) { + return basicBusTypePreDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } + /** * 设置创建/更新信息 * diff --git a/src/main/java/com/glxp/api/service/inout/ReceiveService.java b/src/main/java/com/glxp/api/service/inout/ReceiveService.java index f0592f6d0..bd7aed7cb 100644 --- a/src/main/java/com/glxp/api/service/inout/ReceiveService.java +++ b/src/main/java/com/glxp/api/service/inout/ReceiveService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inout; +import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.req.inout.FilterReceiveRequest; import com.glxp.api.res.inout.ReceiveResponse; @@ -21,4 +22,7 @@ public interface ReceiveService { boolean delReceive(String orderIdFk); + + + } diff --git a/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java b/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java index 15e4c8422..b097e0b36 100644 --- a/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java +++ b/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inout; +import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.req.inout.FilterReceiveDetailRequest; import com.glxp.api.req.inout.FilterReceiveRequest; @@ -22,5 +23,5 @@ public interface ReceivedetailService { boolean delDetail(String id); - + BasicProductsEntity selectIoOrderDetailBiz(long id); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java index 2562bd1b0..8e046072b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java @@ -3,6 +3,7 @@ package com.glxp.api.service.inout.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.ReceiveDetailDao; +import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.req.inout.FilterReceiveDetailRequest; import com.glxp.api.req.inout.UpdateReceiveDetailRequest; @@ -55,5 +56,8 @@ public class ReceiveDetailServiceImpl implements ReceivedetailService { return true; } - + @Override + public BasicProductsEntity selectIoOrderDetailBiz(long id) { + return receiveDetailDao.selectIoOrderDetailBiz(id); + } } diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java index f9e071747..866506bab 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.ReceiveDao; import com.glxp.api.dao.inout.ReceiveDetailDao; +import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.req.inout.FilterReceiveRequest; @@ -38,9 +39,9 @@ public class ReceiveServiceImpl implements ReceiveService { @Override public int updateOrder(PurReceiveEntity purReceiveEntity) { - QueryWrapper ew=new QueryWrapper<>(); - ew.eq("billNo",purReceiveEntity.getBillNo()); - return receiveDao.update(purReceiveEntity,ew); + QueryWrapper ew = new QueryWrapper<>(); + ew.eq("billNo", purReceiveEntity.getBillNo()); + return receiveDao.update(purReceiveEntity, ew); } @Override @@ -67,4 +68,6 @@ public class ReceiveServiceImpl implements ReceiveService { } + + } diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml index 4f5748d84..9560b4eac 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml @@ -2,10 +2,11 @@ UPDATE pur_receive_detail - orderIdFk=#{orderIdFk}, - relIdFk=#{relIdFk}, - nameCode=#{nameCode}, - count=#{count}, - supId=#{supId}, - productDate=#{productDate}, - batchNo=#{batchNo}, - expireDate=#{expireDate}, + + orderIdFk=#{orderIdFk}, + + + relIdFk=#{relIdFk}, + + + nameCode=#{nameCode}, + + + count=#{count}, + + + supId=#{supId}, + + + productDate=#{productDate}, + + + batchNo=#{batchNo}, + + + expireDate=#{expireDate}, + WHERE id = #{id} + + From abe47786b582533aba793f1010154cbcbfe7098a Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 19 Apr 2023 14:37:08 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E7=94=9F=E6=88=90=E4=B8=9A=E5=8A=A1=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=8D=95=E7=AD=89=E4=BF=AE=E6=94=B9=E8=BF=81?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/service/inout/IoAddInoutService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index aaebf94be..aa276a9cd 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -326,7 +326,7 @@ public class IoAddInoutService { IoOrderEntity order = orderService.findByBillNo(orderId); BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(order.getAction()); if (StrUtil.isBlank(bussinessTypeEntity.getSupplementOrderType())) { - return ResultVOUtils.error(ResultEnum.valueOf("此类型单据不可补单")); + return ResultVOUtils.error(500,"此单据类型不可补单"); } IoOrderEntity supplementOrder = new IoOrderEntity(); BeanUtil.copyProperties(order, supplementOrder); From e3c25b05b5836e19f9a61191570f63506ef67a16 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 19 Apr 2023 14:47:05 +0800 Subject: [PATCH 17/17] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=97=B6=E9=97=B4=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java | 5 +++++ .../api/service/thrsys/impl/ThrSystemDetailServiceImpl.java | 3 ++- .../resources/mybatis/mapper/thrsys/ThrSystemDetailDao.xml | 1 + src/main/resources/schemas/schema_v2.1.sql | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java index e0918c8bb..64205c117 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java @@ -19,6 +19,11 @@ public class ThrSystemDetailEntity { private String localAction; private String thirdAction; + /** + * 请求时间，单位：分钟 + */ + private Integer time; + public String getValue() { if (value == null) return null; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java index 752c15056..f96c99d13 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java @@ -50,10 +50,11 @@ public class ThrSystemDetailServiceImpl implements ThrSystemDetailService { return data; } - @Transactional(rollbackFor = Exception.class) @Override public void updateInterfaceStatus(List list) { for (ThrSystemDetailEntity thrSystemDetailEntity : list) { + //请求默认0分钟 + thrSystemDetailEntity.setTime(0); thrSystemDetailDao.updateBasicThirdSysDetail(thrSystemDetailEntity); } } diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrSystemDetailDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrSystemDetailDao.xml index fbc6227f4..dc79e9075 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrSystemDetailDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrSystemDetailDao.xml @@ -14,6 +14,7 @@ name=#{name}, fromType=#{fromType}, thirdSysFk=#{thirdSysFk}, + time=#{time}, WHERE id=#{id} diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 82ca826fa..68738fbde 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -186,6 +186,8 @@ CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_biz', 'updateTime', 'dateti CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_label', 'updateTime', 'datetime', 1); CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_statemen', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('thr_system_detail', 'time', 'int(5)', 1); + # CALL Pro_Temp_ColumnWork('sup_cert_set', 'foreign', 'tinyint', 3); # CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1);