diff --git a/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java b/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java index c4f1b6e1..c01af5c1 100644 --- a/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java +++ b/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java @@ -8,6 +8,7 @@ import com.glxp.api.exception.JsonException; import com.glxp.api.util.JwtUtils; import com.glxp.api.common.enums.ResultEnum; import io.jsonwebtoken.Claims; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; @@ -28,10 +29,11 @@ import java.lang.reflect.Method; @Aspect @Component @Slf4j +@RequiredArgsConstructor public class AuthorizeAspect { - @Resource - private AuthLicenseDao authLicenseDao; + + private final AuthLicenseDao authLicenseDao; @Pointcut("@annotation(com.glxp.api.annotation.AuthRuleAnnotation)") public void adminLoginVerify() { diff --git a/src/main/java/com/glxp/api/constant/BasicExportStatusEnum.java b/src/main/java/com/glxp/api/constant/BasicExportStatusEnum.java new file mode 100644 index 00000000..6f3aad8d --- /dev/null +++ b/src/main/java/com/glxp/api/constant/BasicExportStatusEnum.java @@ -0,0 +1,35 @@ +package com.glxp.api.constant; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum BasicExportStatusEnum { + + /** + * 任务待触发 + */ + WAIT_TRIGGERED(1, "任务待触发"), + + /** + * 文件待生成 + */ + WAIT_BUILT(2, "文件待生成"), + + /** + * 文件待同步 + */ + WAIT_SYNC(3, "文件待同步"), + + /** + * 任务完成 + */ + COMPLETED(4, "任务完成"), + ; + @EnumValue + private Integer code; + + private String remark; +} diff --git a/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java new file mode 100644 index 00000000..a4117719 --- /dev/null +++ b/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java @@ -0,0 +1,36 @@ +package com.glxp.api.constant; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.beans.factory.annotation.Value; + +@Getter +@AllArgsConstructor +public enum BasicExportStatusTimeEnum { + + /** + * 耗材字典 + */ + BASIC_PRODUCTS("basic_products", "耗材字典"), + + /** + * 往来单位字典 + */ + BASIC_CORP("basic_corp", "往来单位字典"), + + /** + * 国家库DI数据 + */ + DB_DI_PRODUCTS("db_di_products", "国家库DI数据"), + + /** + * 首营资质 + */ + SUP_CERT("sup_cert", "首营资质"), + ; + @EnumValue + private String key; + + private String remark; +} diff --git a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java new file mode 100644 index 00000000..a45e38a7 --- /dev/null +++ b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java @@ -0,0 +1,20 @@ +package com.glxp.api.constant; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum BasicExportTypeEnum { + + /** + * 基础数据 + */ + BASIC_DATA("basic_data", "基础数据"), + ; + @EnumValue + private String key; + + private String remark; +} diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index 6e0e9998..46be5f28 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/src/main/java/com/glxp/api/constant/ConstantStatus.java @@ -207,6 +207,7 @@ public class ConstantStatus { public static final int FROM_RECEIVE = 13; //领用单据转单 public static final int FROM_THRORDER = 14; //第三方单据转单 public static final int FROM_Order = 15; //采购计划转单 + public static final int FROM_BACK = 17; //出库转退货单; //DI类型 diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index 6d97faae..5ea31ca1 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -210,6 +210,9 @@ public class SysUserController extends BaseController { // userService.insertUserAuth1(sysUserRole); //默认插入第一部门 List deptCodeList=authUserSaveRequest.getDepts(); + if(deptCodeList == null){ + deptCodeList=new ArrayList<>(); + } deptCodeList.add(1L); authUserSaveRequest.setDepts(deptCodeList); diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 1a148330..bb75eee4 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.inout; +import cn.hutool.Hutool; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -93,6 +94,8 @@ public class IoCodeTempController extends BaseController { @Resource IoOrderDetailBizService orderDetailBizService; + @Resource + IoCodeService codeService; //手持端扫码单据上传调用接口 @AuthRuleAnnotation("") @@ -464,33 +467,65 @@ public class IoCodeTempController extends BaseController { //校验预验收库存是否已存在 if (bussinessTypeEntity.isScanPreIn()) { + if (bussinessTypeEntity.getBackPreinType() == 1) {//按单出库 + String orderIds = bussinessTypeEntity.getCheckPreInOrders(); + if (StrUtil.isNotEmpty(orderIds)) { + String[] orderIdArray = StringUtils.split(","); + List orderList = CollUtil.toList(orderIdArray); + int count = codeService.findByOrderIdsCount(orderList, code); + if (count <= 0) { + return ResultVOUtils.error(500, "预验收库存数量不足！"); + } + if (StrUtil.isNotEmpty(orderId)) {//非首次添加 + if (StrUtil.isEmpty(udiEntity.getSerialNo())) {//该单据已有该产品 + //无序列号，则可能存在多个预验收入库单 + IoCodeTempEntity codeTempEntity = codeTempService.findByUnique(orderId, code); + if (codeTempEntity != null) { + if (count < (codeTempEntity.getMyCount() + 1)) { + return ResultVOUtils.error(500, "超出预验收库存数量"); + } + } + } else { + if (count < 1) { + return ResultVOUtils.error(500, "预验收库存数量不足"); + } + } + } - int preInCount = invPreinProductDetailService.findCountByCode(code); - InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(code); - if (preInCount <= 0) { - return ResultVOUtils.error(500, "预验收库存数量不足！"); - } else { - if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(addOrderRequest.getBatchNo()) - && !invPreinDetailEntity.getBatchNo().equals(addOrderRequest.getBatchNo())) { - return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！"); + } else { + return ResultVOUtils.error(500, "未选择预验收入库单，请先选择预验收入库单！"); } - if (StrUtil.isNotEmpty(orderId)) {//非首次添加 - if (StrUtil.isEmpty(udiEntity.getSerialNo())) {//该单据已有该产品 - //无序列号，则可能存在多个预验收入库单 - IoCodeTempEntity codeTempEntity = codeTempService.findByUnique(orderId, code); - if (codeTempEntity != null) { - if (preInCount < (codeTempEntity.getMyCount() + 1)) { - return ResultVOUtils.error(500, "超出预验收库存数量"); + + } else { //按库存出库 + int preInCount = invPreinProductDetailService.findCountByCode(code); + InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(code); + if (preInCount <= 0) { + return ResultVOUtils.error(500, "预验收库存数量不足！"); + } else { + if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(addOrderRequest.getBatchNo()) + && !invPreinDetailEntity.getBatchNo().equals(addOrderRequest.getBatchNo())) { + return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！"); + } + if (StrUtil.isNotEmpty(orderId)) {//非首次添加 + if (StrUtil.isEmpty(udiEntity.getSerialNo())) {//该单据已有该产品 + //无序列号，则可能存在多个预验收入库单 + IoCodeTempEntity codeTempEntity = codeTempService.findByUnique(orderId, code); + if (codeTempEntity != null) { + if (preInCount < (codeTempEntity.getMyCount() + 1)) { + return ResultVOUtils.error(500, "超出预验收库存数量"); + } + } + } else { + if (preInCount < 1) { + return ResultVOUtils.error(500, "预验收库存数量不足"); } - } - } else { - if (preInCount < 1) { - return ResultVOUtils.error(500, "预验收库存数量不足"); } } } } + + } diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index a84ee85d..77e6fdd7 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -1,29 +1,36 @@ package com.glxp.api.controller.sync; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.Dict; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.*; +import com.glxp.api.controller.purchase.PurOrderController; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.auth.*; import com.glxp.api.dao.basic.BasicBusTypeChangeDao; +import com.glxp.api.dao.basic.BasicBusTypePreDao; import com.glxp.api.dao.basic.BasicBussinessTypeDao; +import com.glxp.api.dao.basic.EntrustReceDao; import com.glxp.api.dao.inout.*; -import com.glxp.api.dao.thrsys.ThrBusTypeOriginDao; -import com.glxp.api.dao.thrsys.ThrDeptDao; -import com.glxp.api.dao.thrsys.ThrInvWarehouseDao; +import com.glxp.api.dao.schedule.SystemParamConfigDao; +import com.glxp.api.dao.system.*; +import com.glxp.api.dao.thrsys.*; import com.glxp.api.entity.auth.*; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; +import com.glxp.api.entity.basic.BasicBusTypePreEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; +import com.glxp.api.entity.basic.EntrustReceEntity; +import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inout.*; -import com.glxp.api.entity.purchase.PurOrderDetailEntity; -import com.glxp.api.entity.purchase.PurOrderEntity; +import com.glxp.api.entity.purchase.*; import com.glxp.api.entity.sync.BasicDownloadStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusEntity; -import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; -import com.glxp.api.entity.thrsys.ThrDeptEntity; -import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.api.entity.system.*; +import com.glxp.api.entity.thrsys.*; import com.glxp.api.req.sync.SpsSyncDataRequest; import com.glxp.api.res.sync.*; import com.glxp.api.service.inout.IoAddInoutService; @@ -35,6 +42,8 @@ import com.glxp.api.service.sync.BasicDownloadService; import com.glxp.api.service.sync.BasicExportService; import com.glxp.api.service.sync.SpsSyncDownloadService; import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.JsonUtils; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; @@ -47,8 +56,13 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; @RestController public class SpsSyncDownloadController { @@ -135,6 +149,67 @@ public class SpsSyncDownloadController { } + // 下发基础数据 ，供给中继服务，UDI管理系统下载 + @AuthRuleAnnotation("") + @GetMapping("sps/sync/basicData") + public BaseResponse getBasicData() { + BaseResponse baseResponse = new BaseResponse<>(); + SpsSyncBasicDataResponse spsSyncBasicDataResponse = new SpsSyncBasicDataResponse(); + BasicExportStatusEntity one = basicExportService.getOne(Wrappers.lambdaQuery(BasicExportStatusEntity.class) + .eq(BasicExportStatusEntity::getType, BasicExportTypeEnum.BASIC_DATA.getRemark()) + .orderByDesc(BasicExportStatusEntity::getStartTime) + .last("limit 1") + ); + if (one != null) { + if (BasicExportStatusEnum.WAIT_TRIGGERED.getCode().equals(one.getStatus())) { + basicExportService.update(Wrappers.lambdaUpdate(BasicExportStatusEntity.class) + .set(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.WAIT_BUILT.getCode()) + .set(BasicExportStatusEntity::getUpdateTime, new Date()) + .eq(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.WAIT_TRIGGERED.getCode()) + .eq(BasicExportStatusEntity::getId, one.getId()) + ); + } else if (BasicExportStatusEnum.WAIT_SYNC.getCode().equals(one.getStatus())) { + // 读取文件数据 + try { + FileReader reader = new FileReader(one.getCacheFilePath()); + StringBuilder str = new StringBuilder(); + int data; + while ((data = reader.read()) != -1) { + str.append(data); + } + reader.close(); + Dict map = JsonUtils.parseMap(str.toString()); + // 组装返回数据 + spsSyncBasicDataResponse.setTaskId(one.getId()); + spsSyncBasicDataResponse.setHospTypeList((List) map.get(BasicHospTypeEntity.class.getName())); + spsSyncBasicDataResponse.setUdiRelevanceList((List) map.get(UdiRelevanceEntity.class.getName())); + spsSyncBasicDataResponse.setProductsList((List) map.get(BasicProductsEntity.class.getName())); + spsSyncBasicDataResponse.setRelevanceList((List) map.get(CompanyProductRelevanceEntity.class.getName())); + spsSyncBasicDataResponse.setCorpList((List) map.get(BasicCorpEntity.class.getName())); + spsSyncBasicDataResponse.setSupCertList((List) map.get(SupCertEntity.class.getName())); + spsSyncBasicDataResponse.setSupCertSetList((List) map.get(SupCertSetEntity.class.getName())); + spsSyncBasicDataResponse.setSupCompanyList((List) map.get(SupCompanyEntity.class.getName())); + spsSyncBasicDataResponse.setSupManufacturerList((List) map.get(SupManufacturerEntity.class.getName())); + spsSyncBasicDataResponse.setSupProductList((List) map.get(SupProductEntity.class.getName())); + } catch (FileNotFoundException e) { + throw new RuntimeException("系统异常，未找到对应数据文件"); + } catch (IOException e) { + throw new RuntimeException(e); + } + // 修改任务状态 +// basicExportService.update(Wrappers.lambdaUpdate(BasicExportStatusEntity.class) +// .set(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.COMPLETED.getCode()) +// .set(BasicExportStatusEntity::getUpdateTime, new Date()) +// .set(BasicExportStatusEntity::getEndTime, new Date()) +// .eq(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.WAIT_SYNC.getCode()) +// .eq(BasicExportStatusEntity::getId, one.getId()) +// ); + } + } + baseResponse.setData(spsSyncBasicDataResponse); + return baseResponse; + } + //接收中继服务、UDI管理系统上传单据 @AuthRuleAnnotation("sps/sync/order/upload") @PostMapping("/sps/sync/order/upload") @@ -477,7 +552,7 @@ public class SpsSyncDownloadController { //接收中继服务、UDI管理系统上传基础信息 - @AuthRuleAnnotation("") + //@AuthRuleAnnotation("") @PostMapping("/sps/sync/thrData/upload") public BaseResponse uploadThrData(@RequestBody @Valid SpsSyncThrDataResponse spsSyncThrDataResponse) { if (spsSyncThrDataResponse != null) { @@ -487,9 +562,9 @@ public class SpsSyncDownloadController { basicDownloadStatusEntity.setId(CustomUtil.getId()); basicDownloadStatusEntity.setTaskId(spsSyncThrDataResponse.getTaskId()); basicDownloadStatusEntity.setStartTime(new Date()); - basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_BUS_TYPE); + basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_THR_DATA); basicDownloadStatusEntity.setStatus(0); - basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_BUS); + basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_THR_DATA); basicDownloadStatusEntity.setScheduleType(1); basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); @@ -512,6 +587,15 @@ public class SpsSyncDownloadController { sqlSession.commit(); remark.append("第三方仓库信息：").append(spsSyncThrDataResponse.getInvWarehouseEntities().size()).append("条\n"); + //第三方往来单位信息 + if (CollUtil.isNotEmpty(spsSyncThrDataResponse.getCorpEntities())) { + List corpEntities = spsSyncThrDataResponse.getCorpEntities(); + ThrCorpDao mapper = sqlSession.getMapper(ThrCorpDao.class); + corpEntities.forEach(mapper::insertOrUpdate); + } + sqlSession.commit(); + remark.append("第三方往来单位信息：").append(spsSyncThrDataResponse.getCorpEntities().size()).append("条\n"); + sqlSession.close(); basicDownloadStatusEntity.setStatus(1); basicDownloadStatusEntity.setUpdateTime(new Date()); @@ -524,17 +608,161 @@ public class SpsSyncDownloadController { } //接收中继服务、UDI管理系统上传系统设置 - @AuthRuleAnnotation("") + //@AuthRuleAnnotation("") @PostMapping("/sps/sync/sys/setting") public BaseResponse uploadSysSetting(@RequestBody @Valid SpsSyncSysSettingResponse spsSyncSysSettingResponse) { - return ResultVOUtils.success(); + if (spsSyncSysSettingResponse != null) { + SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); + + BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); + basicDownloadStatusEntity.setId(CustomUtil.getId()); + basicDownloadStatusEntity.setTaskId(spsSyncSysSettingResponse.getTaskId()); + basicDownloadStatusEntity.setStartTime(new Date()); + basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_SYS_SETTING); + basicDownloadStatusEntity.setStatus(0); + basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_SYS_SETTING); + basicDownloadStatusEntity.setScheduleType(1); + basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); + + StringBuilder remark = new StringBuilder(); + + //系统运行参数 + if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSystemParamConfigEntities())) { + List systemParamConfigEntities = spsSyncSysSettingResponse.getSystemParamConfigEntities(); + SystemParamConfigDao mapper = sqlSession.getMapper(SystemParamConfigDao.class); + systemParamConfigEntities.forEach(mapper::insertOrUpdate); + } + sqlSession.commit(); + remark.append("系统运行参数：").append(spsSyncSysSettingResponse.getSystemParamConfigEntities().size()).append("条\n"); + + //委托验收设置 + if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getEntrustReceEntities())) { + List entrustReceEntities = spsSyncSysSettingResponse.getEntrustReceEntities(); + EntrustReceDao mapper = sqlSession.getMapper(EntrustReceDao.class); + entrustReceEntities.forEach(mapper::insertOrUpdate); + } + sqlSession.commit(); + remark.append("委托验收设置：").append(spsSyncSysSettingResponse.getEntrustReceEntities().size()).append("条\n"); + + //打印模块 + if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSystemPDFModuleEntities())) { + List systemPDFModuleEntities = spsSyncSysSettingResponse.getSystemPDFModuleEntities(); + SystemPDFModuleDao mapper = sqlSession.getMapper(SystemPDFModuleDao.class); + systemPDFModuleEntities.forEach(mapper::insertOrUpdate); + } + sqlSession.commit(); + remark.append("打印模块：").append(spsSyncSysSettingResponse.getSystemPDFModuleEntities().size()).append("条\n"); + + //打印模板 + if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSystemPDFTemplateEntities())) { + List systemPDFTemplateEntities = spsSyncSysSettingResponse.getSystemPDFTemplateEntities(); + SystemPDFTemplateDao mapper = sqlSession.getMapper(SystemPDFTemplateDao.class); + systemPDFTemplateEntities.forEach(mapper::insertOrUpdate); + } + sqlSession.commit(); + remark.append("打印模板：").append(spsSyncSysSettingResponse.getSystemPDFTemplateEntities().size()).append("条\n"); + + //扫码单据关联表 + if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceCodeEntities())) { + List sysPdfTemplateRelevanceCodeEntities = spsSyncSysSettingResponse.getSysPdfTemplateRelevanceCodeEntities(); + SysPdfTemplateRelevanceCodeDao mapper = sqlSession.getMapper(SysPdfTemplateRelevanceCodeDao.class); + sysPdfTemplateRelevanceCodeEntities.forEach(mapper::insertOrUpdate); + } + sqlSession.commit(); + remark.append("扫码单据关联表：").append(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceCodeEntities().size()).append("条\n"); + + //业务单据关联表 + if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceBizEntities())) { + List sysPdfTemplateRelevanceBizEntities = spsSyncSysSettingResponse.getSysPdfTemplateRelevanceBizEntities(); + SysPdfTemplateRelevanceBizDao mapper = sqlSession.getMapper(SysPdfTemplateRelevanceBizDao.class); + sysPdfTemplateRelevanceBizEntities.forEach(mapper::insertOrUpdate); + } + sqlSession.commit(); + remark.append("业务单据关联表：").append(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceBizEntities().size()).append("条\n"); + + //内部码打印关联表 + if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceLabelEntities())) { + List sysPdfTemplateRelevanceLabelEntities = spsSyncSysSettingResponse.getSysPdfTemplateRelevanceLabelEntities(); + SysPdfTemplateRelevanceLabelDao mapper = sqlSession.getMapper(SysPdfTemplateRelevanceLabelDao.class); + sysPdfTemplateRelevanceLabelEntities.forEach(mapper::insertOrUpdate); + } + sqlSession.commit(); + remark.append("内部码打印关联表：").append(spsSyncSysSettingResponse.getSystemParamConfigEntities().size()).append("条\n"); + + //资质证书打印关联表 + if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceStatemenEntities())) { + List sysPdfTemplateRelevanceStatemenEntities = spsSyncSysSettingResponse.getSysPdfTemplateRelevanceStatemenEntities(); + SysPdfTemplateRelevanceStatemenDao mapper = sqlSession.getMapper(SysPdfTemplateRelevanceStatemenDao.class); + sysPdfTemplateRelevanceStatemenEntities.forEach(mapper::insertOrUpdate); + } + sqlSession.commit(); + remark.append("资质证书打印关联表：").append(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceStatemenEntities().size()).append("条\n"); + + //自动建出入库单设置 + if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getBasicBusTypePreEntities())) { + List basicBusTypePreEntities = spsSyncSysSettingResponse.getBasicBusTypePreEntities(); + BasicBusTypePreDao mapper = sqlSession.getMapper(BasicBusTypePreDao.class); + basicBusTypePreEntities.forEach(mapper::insertOrUpdate); + } + sqlSession.commit(); + remark.append("自动建出入库单设置：").append(spsSyncSysSettingResponse.getBasicBusTypePreEntities().size()).append("条\n"); + + //自动建业务单设置 + if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getBasicBusTypeChangeEntities())) { + List basicBusTypeChangeEntities = spsSyncSysSettingResponse.getBasicBusTypeChangeEntities(); + BasicBusTypeChangeDao mapper = sqlSession.getMapper(BasicBusTypeChangeDao.class); + basicBusTypeChangeEntities.forEach(mapper::insertOrUpdate); + } + sqlSession.commit(); + remark.append("自动建业务单设置：").append(spsSyncSysSettingResponse.getBasicBusTypeChangeEntities().size()).append("条\n"); + + sqlSession.close(); + basicDownloadStatusEntity.setStatus(1); + basicDownloadStatusEntity.setUpdateTime(new Date()); + basicDownloadStatusEntity.setEndTime(new Date()); + basicDownloadStatusEntity.setRemark(remark.toString()); + basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); + } + + return ResultVOUtils.success("上传成功"); } //接收中继服务、UDI管理系统上传第三方产品信息 - @AuthRuleAnnotation("") + //@AuthRuleAnnotation("") @PostMapping("/sps/sync/thrData/products/upload") public BaseResponse uploadThrProducts(@RequestBody @Valid SpsSyncThrProductsResponse spsSyncThrProductsResponse) { - return ResultVOUtils.success(); + if (spsSyncThrProductsResponse != null) { + SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); + + BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); + basicDownloadStatusEntity.setId(CustomUtil.getId()); + basicDownloadStatusEntity.setTaskId(spsSyncThrProductsResponse.getTaskId()); + basicDownloadStatusEntity.setStartTime(new Date()); + basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_THR_PRODUCTS); + basicDownloadStatusEntity.setStatus(0); + basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_THR_PRODUCTS); + basicDownloadStatusEntity.setScheduleType(1); + basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); + + StringBuilder remark = new StringBuilder(); + //第三方产品信息 + if (CollUtil.isNotEmpty(spsSyncThrProductsResponse.getProductsEntities())) { + List productsEntities = spsSyncThrProductsResponse.getProductsEntities(); + ThrProductsDao mapper = sqlSession.getMapper(ThrProductsDao.class); + productsEntities.forEach(mapper::insertOrUpdate); + } + sqlSession.commit(); + remark.append("第三方产品信息：").append(spsSyncThrProductsResponse.getProductsEntities().size()).append("条\n"); + + sqlSession.close(); + basicDownloadStatusEntity.setStatus(1); + basicDownloadStatusEntity.setUpdateTime(new Date()); + basicDownloadStatusEntity.setEndTime(new Date()); + basicDownloadStatusEntity.setRemark(remark.toString()); + basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); + } + + return ResultVOUtils.success("上传成功"); } } 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 760b8d18..b77ee887 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,6 @@ public interface BasicBusTypeChangeDao extends BaseMapperPlus filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest); + + boolean insertOrUpdate(BasicBusTypeChangeEntity record); } 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 c7be7d40..9d0fae66 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); + boolean insertOrUpdate(BasicBusTypePreEntity record); + } \ No newline at end of file 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 9f0a685d..62293dcb 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -1,9 +1,9 @@ package com.glxp.api.dao.basic; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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; @@ -11,16 +11,16 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface BasicCorpDao { +public interface BasicCorpDao extends BaseMapper { 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/BasicProductsDao.java b/src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java new file mode 100644 index 00000000..0239553d --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java @@ -0,0 +1,16 @@ +package com.glxp.api.dao.basic; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.basic.BasicProductSetEntity; +import com.glxp.api.entity.basic.BasicProductsEntity; +import com.glxp.api.req.basic.FilterBasicProductSetrequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface BasicProductsDao extends BaseMapper { + + +} diff --git a/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java b/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java index b3c98f63..f8329c09 100644 --- a/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java @@ -27,5 +27,6 @@ public interface EntrustReceDao 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 d0b65f8e..0ddded8a 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,7 @@ package com.glxp.api.dao.purchase; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.purchase.SupCompanyEntity; import com.glxp.api.req.purchase.FilterSupCompanyRequest; import org.apache.ibatis.annotations.Mapper; @@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface SupCompanyDao { +public interface SupCompanyDao extends BaseMapper { 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 261c8a43..3d5e4858 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.baomidou.mybatisplus.core.mapper.BaseMapper; 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 BaseMapper { SupManufacturerEntity findCompany(Long id); diff --git a/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java b/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java index c19df855..fa284177 100644 --- a/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java +++ b/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java @@ -29,4 +29,6 @@ public interface SystemParamConfigDao { boolean insert(SystemParamConfigEntity systemParamConfigEntity); + int insertOrUpdate(SystemParamConfigEntity record); + } diff --git a/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java b/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java index 0ff63900..4cb3a2de 100644 --- a/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java +++ b/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.sync; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.req.sync.BasicExportStatusRequest; import org.apache.ibatis.annotations.Mapper; @@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface BasicExportDao { +public interface BasicExportDao extends BaseMapper { List filterExportStatus(BasicExportStatusRequest basicExportStatusRequest); diff --git a/src/main/java/com/glxp/api/dao/sync/BasicExportTimeDao.java b/src/main/java/com/glxp/api/dao/sync/BasicExportTimeDao.java index aa615cca..c281ff6f 100644 --- a/src/main/java/com/glxp/api/dao/sync/BasicExportTimeDao.java +++ b/src/main/java/com/glxp/api/dao/sync/BasicExportTimeDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.sync; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.req.sync.BasicExportTimeRequest; import org.apache.ibatis.annotations.Mapper; @@ -7,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface BasicExportTimeDao { +public interface BasicExportTimeDao extends BaseMapper { List filterExportStatus(BasicExportTimeRequest basicExportStatusRequest); diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java index b3dd0602..3315b091 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java @@ -1,19 +1,17 @@ package com.glxp.api.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.system.SysMenuHelpEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; - -import java.util.List; - -import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; -import org.apache.ibatis.annotations.Param; + +import java.util.List; public interface SysPdfTemplateRelevanceBizDao extends BaseMapper { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); boolean upInsert(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity); + + boolean insertOrUpdate(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java index b3a12455..14606eb6 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java @@ -1,16 +1,13 @@ package com.glxp.api.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; - -import java.util.List; - -import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface SysPdfTemplateRelevanceCodeDao extends BaseMapper { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); @@ -19,6 +16,6 @@ public interface SysPdfTemplateRelevanceCodeDao extends BaseMapper { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); + + boolean insertOrUpdate(SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java index b0ad9e2a..f76b59bd 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java @@ -1,17 +1,16 @@ package com.glxp.api.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; - -import java.util.List; - import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; -import org.apache.ibatis.annotations.Param; + +import java.util.List; public interface SysPdfTemplateRelevanceStatemenDao extends BaseMapper { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); + boolean insertOrUpdate(SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity); + } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java index d9116ab0..01c8f8d7 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.system; -import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.req.system.SysPdfModuleSaveRequest; @@ -27,4 +26,6 @@ public interface SystemPDFModuleDao { boolean insert(SystemPDFModuleEntity systemPDFModuleEntity); boolean deleteById(Integer id); + + boolean insertOrUpdate(SystemPDFModuleEntity systemPDFModuleEntity); } diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java index 3dff5d4f..4fdf2c8f 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java @@ -23,4 +23,6 @@ public interface SystemPDFTemplateDao { boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity); boolean deleteById(Integer id); + + boolean insertOrUpdate(SystemPDFTemplateEntity systemPDFTemplateEntity); } diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java index a75bc503..0f7538dd 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java @@ -36,4 +36,5 @@ public interface ThrCorpDao { ThrSystemDetailEntity selectByKey(@Param("key") String key, @Param("thirdSys") String thirdSys); + boolean insertOrUpdate(ThrCorpEntity thrCorpEntity); } diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java index 9ee906f4..d8b7069b 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java @@ -1,10 +1,8 @@ package com.glxp.api.dao.thrsys; import com.glxp.api.entity.thrsys.ThrProductsEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.thrsys.ThrProductsResponse; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -33,6 +31,6 @@ public interface ThrProductsDao { List selectThrProducts(FilterThrProductsRequest filterThrProductsRequest); - + int insertOrUpdate(ThrProductsEntity record); } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index 0b34c3fc..7508133b 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -402,6 +402,8 @@ public class BasicBussinessTypeEntity { // 预验收剩余库存退库方式 1:按单使用或退库，2：按货位/仓库使用或退库 @TableField(value = "backPreinType") private Integer backPreinType; + @TableField(value = "checkPreInOrders") + private String checkPreInOrders; // 寄售使用禁止无库存出库 @TableField(value = "advancePreIn") diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductSetEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductSetEntity.java index 48ddcae4..8863866b 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicProductSetEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductSetEntity.java @@ -1,10 +1,15 @@ package com.glxp.api.entity.basic; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data +@TableName(value = "basic_product_set") public class BasicProductSetEntity { + @TableId(type = IdType.AUTO) private Integer id; private String parmName; private String parmKey; @@ -17,6 +22,4 @@ public class BasicProductSetEntity { private Integer sort; - - } diff --git a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java index 7a0e08a5..d86c32cd 100644 --- a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java @@ -2,20 +2,42 @@ package com.glxp.api.entity.sync; import java.util.Date; +import cn.hutool.core.date.DateUtil; +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 com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.ibatis.type.JdbcType; @Data +@TableName("basic_export_status") +@Builder +@AllArgsConstructor +@NoArgsConstructor public class BasicExportStatusEntity { + @TableId(type = IdType.INPUT) private String id; + @TableField(value = "idDatas") private String idDatas; private Integer status; private String type; + @TableField(value = "updateTime") private Date updateTime; + @TableField(value = "scheduleType") private Integer scheduleType; + @TableField(value = "startTime") private Date startTime; + @TableField(value = "endTime") private Date endTime; private String remark; + @TableField(value = "receiveStatus") private String receiveStatus; + @TableField(value = "cacheFilePath") private String cacheFilePath; } diff --git a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusTimeEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusTimeEntity.java index fc516426..724fe3ec 100644 --- a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusTimeEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusTimeEntity.java @@ -1,12 +1,27 @@ package com.glxp.api.entity.sync; +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.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; +@Builder +@NoArgsConstructor +@AllArgsConstructor @Data +@TableName("basic_export_status_time") public class BasicExportStatusTimeEntity { + @TableId(value = "id", type = IdType.AUTO) private Integer id; + @TableField(value = "lastUpdateTime") private String lastUpdateTime; + + @TableField(value = "`key`") private String key; private String remark; diff --git a/src/main/java/com/glxp/api/idc/controller/FileController.java b/src/main/java/com/glxp/api/idc/controller/FileController.java index 97779ca1..92c9e2eb 100644 --- a/src/main/java/com/glxp/api/idc/controller/FileController.java +++ b/src/main/java/com/glxp/api/idc/controller/FileController.java @@ -30,10 +30,21 @@ public class FileController { @RequestMapping(value = "/spssync/file/upload") @ResponseBody - public BaseResponse connect(HttpServletRequest request, @RequestBody Map params) { + public BaseResponse upload(HttpServletRequest request, @RequestBody Map params) { return fileService.fileUpload(request,params); } + @RequestMapping(value = "/spssync/file/download") + @ResponseBody + public BaseResponse download(HttpServletRequest request, @RequestBody Map params) { + return fileService.fileDownload(request,params); + } + + @RequestMapping(value = "/spssync/file/downloadFile") + @ResponseBody + public BaseResponse downloadFile(HttpServletRequest request, @RequestBody Map params) { + return fileService.downloadFile(request,params); + } @RequestMapping(value = "/spssync/file/uploadFile") public BaseResponse uploadFile(HttpServletRequest request, 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 9a2fe876..d0283334 100644 --- a/src/main/java/com/glxp/api/idc/service/FileService.java +++ b/src/main/java/com/glxp/api/idc/service/FileService.java @@ -12,5 +12,7 @@ import com.glxp.api.common.res.BaseResponse; /*文件服务*/ public interface FileService { BaseResponse fileUpload(HttpServletRequest request,Map params); + BaseResponse fileDownload(HttpServletRequest request,Map params); + BaseResponse downloadFile(HttpServletRequest request,Map params); BaseResponse receiveFile(HttpServletRequest request,String content,MultipartFile[] files); } diff --git a/src/main/java/com/glxp/api/idc/service/IdcService.java b/src/main/java/com/glxp/api/idc/service/IdcService.java index 031d2f49..67ebe23a 100644 --- a/src/main/java/com/glxp/api/idc/service/IdcService.java +++ b/src/main/java/com/glxp/api/idc/service/IdcService.java @@ -38,4 +38,5 @@ public interface IdcService { void downloadFile(String fileName,HttpServletResponse response) ; BaseResponse onceSync(String tableName,boolean isUpload); + boolean signleDownloadFile(String syncIp, String fileName); } 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 4228de3b..317efb9c 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 @@ -19,10 +19,12 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.idc.DbDao; import com.glxp.api.idc.service.FileService; +import com.glxp.api.idc.service.IdcService; import com.glxp.api.idc.utils.IDCUtils; import com.glxp.api.util.FileUtils; @@ -47,6 +49,8 @@ public class FileServiceImpl implements FileService { @Resource private DbDao dbDao; + @Resource + private IdcService idcService; private String imagePath = "register/file/image2/"; @Override public BaseResponse fileUpload(HttpServletRequest request,Map params) { @@ -83,9 +87,10 @@ public class FileServiceImpl implements FileService { } } if(!isExists) - return ResultVOUtils.error(9999,"文件不存在"); + return ResultVOUtils.error(9999,filePath + filePathSlash + imagePath + strs[0]); String result = relayFile(files,host); - if (IDCUtils.isJson(result)&&!result.contains(" params) { + Map map = dbDao.get("select * from sync_data_set limit 1"); + if(map!=null&&map.get("syncIp")!=null) { + + String result = IDCUtils.post(map.get("syncIp").toString()+"/spssync/file/downloadFile", params); + boolean 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) + return ResultVOUtils.error(9999,"失败"); + } else { + return ResultVOUtils.error(9999,"中继服务地址未配置，请至同步设置中进行配置"); + } + return ResultVOUtils.success(null); + } + @Override public BaseResponse receiveFile(HttpServletRequest request,String content,MultipartFile[] files) { boolean isRelay = false; @@ -111,7 +145,6 @@ public class FileServiceImpl implements FileService { ArrayList saveFiles = new ArrayList<>(); Date startTime = new Date(); if (files != null) { - logger.debug(filePath + filePathSlash + imagePath); if(!FileUtils.makeDirectory(filePath + filePathSlash + imagePath)) IDCUtils.createDirectory(filePath + filePathSlash + imagePath); try { @@ -132,10 +165,11 @@ public class FileServiceImpl implements FileService { if(isRelay) { String result = relayFile(saveFiles,host); + logger.info(result); if (IDCUtils.isJson(result)&&!result.contains(" params) { + String host = ""; + try { + Map config =dbDao.get("select paramValue from system_param_config where paramKey='upper_server_ip'"); + if(config!=null&&config.get("paramValue")!=null) + host = config.get("paramValue").toString(); + } catch (Exception ex) { + + } + if(!StringUtils.isEmpty(host)) { + String result = IDCUtils.post(host+"/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(host, str)) + success = false; + } + } + if(!success) + ResultVOUtils.error(9999,"失败"); + + } + return ResultVOUtils.success(null); + } + } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index 522065a9..333f28af 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -1162,7 +1162,8 @@ public class IdcServiceImpl implements IdcService { return success; } - private boolean signleDownloadFile(String syncIp, String fileName) { + @Override + public boolean signleDownloadFile(String syncIp, String fileName) { String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/"; if(!FileUtils.makeDirectory(filePath + filePathSlash + imagePath)) IDCUtils.createDirectory(filePath + filePathSlash + imagePath); @@ -1178,10 +1179,11 @@ public class IdcServiceImpl implements IdcService { .post(body) .addHeader("Content-Type", "application/x-www-form-urlencoded") .build(); + int total=0; try { Response result = client.newCall(request).execute(); String msg = result!=null ? result.message().length()>200 ? result.message().substring(0,200) : result.message() : ""; - int total = 0; + if (result!=null&&result.isSuccessful()&&MediaType.parse("application/force-download").equals(result.body().contentType())) { try (InputStream inputStream = result.body().byteStream()) { @@ -1220,7 +1222,7 @@ public class IdcServiceImpl implements IdcService { e.printStackTrace(); } - return true; + return (total>0); } /*获取转发服务地址，当前值允许单向，只使用参数upper_server_ip*/ 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 d3031b40..71cc897e 100644 --- a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java @@ -300,6 +300,7 @@ public class BussinessTypeSaveRequest { private boolean checkCertExpire; private String preInBackAction; private Integer backPreinType; + private String checkPreInOrders; private Boolean advancePreIn; } diff --git a/src/main/java/com/glxp/api/req/system/SysParamConfigSaveRequest.java b/src/main/java/com/glxp/api/req/system/SysParamConfigSaveRequest.java index 19a64c47..dbc4cf81 100644 --- a/src/main/java/com/glxp/api/req/system/SysParamConfigSaveRequest.java +++ b/src/main/java/com/glxp/api/req/system/SysParamConfigSaveRequest.java @@ -2,6 +2,8 @@ package com.glxp.api.req.system; import lombok.Data; +import java.util.Date; + @Data public class SysParamConfigSaveRequest { @@ -13,4 +15,5 @@ public class SysParamConfigSaveRequest { private int paramStatus; private int paramType; private String paramExplain; + private Date updateTime; } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index e101575d..fa394f72 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -149,5 +149,6 @@ public class BasicBussinessTypeResponse { private boolean checkCertExpire; private String preInBackAction; private Integer backPreinType; + private String checkPreInOrders; private Boolean advancePreIn; } diff --git a/src/main/java/com/glxp/api/res/inv/InvPreProductResponse.java b/src/main/java/com/glxp/api/res/inv/InvPreProductResponse.java index 49604be8..65b99981 100644 --- a/src/main/java/com/glxp/api/res/inv/InvPreProductResponse.java +++ b/src/main/java/com/glxp/api/res/inv/InvPreProductResponse.java @@ -105,4 +105,8 @@ public class InvPreProductResponse { */ private String invCode; + /** + 计量单位 + */ + private String measname; } 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 00000000..8f3badf3 --- /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/BasicCorpService.java b/src/main/java/com/glxp/api/service/basic/BasicCorpService.java index d93396b7..82a432a4 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicCorpService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCorpService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.basic; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.res.thrsys.ThrCorpsResponse; @@ -8,7 +9,7 @@ import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; import java.util.List; -public interface BasicCorpService { +public interface BasicCorpService extends IService { List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); 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 7a5854f5..a95866c0 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/CompanyProductRelevanceService.java b/src/main/java/com/glxp/api/service/basic/CompanyProductRelevanceService.java index 0e31f305..ce04e363 100644 --- a/src/main/java/com/glxp/api/service/basic/CompanyProductRelevanceService.java +++ b/src/main/java/com/glxp/api/service/basic/CompanyProductRelevanceService.java @@ -1,13 +1,14 @@ package com.glxp.api.service.basic; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.res.basic.CompanyProductRelevanceResponse; import java.util.List; -public interface CompanyProductRelevanceService { +public interface CompanyProductRelevanceService extends IService { List filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest); diff --git a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java index dad2f591..b89b809b 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.basic; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; @@ -10,7 +11,7 @@ import java.util.List; /** * 耗材字典关联 */ -public interface UdiRelevanceService { +public interface UdiRelevanceService extends IService { List filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest); 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 3ecf7a8a..0aa2748b 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 @@ -1,6 +1,8 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.BooleanUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicCorpDao; import com.glxp.api.entity.basic.BasicCorpEntity; @@ -18,7 +20,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class BasicCorpServiceImpl implements BasicCorpService { +public class BasicCorpServiceImpl extends ServiceImpl implements BasicCorpService { @Resource BasicCorpDao basicCorpDao; @@ -50,13 +52,13 @@ public class BasicCorpServiceImpl implements BasicCorpService { @Override public boolean insert(BasicCorpEntity basicUnitMaintainEntity) { - return basicCorpDao.insert(basicUnitMaintainEntity); + return basicCorpDao.insert(basicUnitMaintainEntity) == 0 ? false : true; } @Override public boolean updateById(BasicCorpEntity basicUnitMaintainSaveRequest) { basicUnitMaintainSaveRequest.setUpdateTime(new Date()); - return basicCorpDao.updateById(basicUnitMaintainSaveRequest); + return basicCorpDao.updateById(basicUnitMaintainSaveRequest) == 0 ? false : true; } @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 4ebcd6b6..9f9a566e 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; @@ -26,7 +27,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -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/basic/impl/CompanyProductRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java index 7528ab4e..e5a3192d 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.basic.impl; 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.CompanyProductRelevanceDao; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; @@ -17,7 +18,8 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class CompanyProductRelevanceServiceImpl implements CompanyProductRelevanceService { +public class CompanyProductRelevanceServiceImpl extends ServiceImpl + implements CompanyProductRelevanceService { @Resource CompanyProductRelevanceDao companyProductRelevanceDao; diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java index 10e8db33..6f571bf0 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.basic.UdiRelevanceDao; @@ -22,7 +23,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class UdiRelevanceServiceImpl implements UdiRelevanceService { +public class UdiRelevanceServiceImpl extends ServiceImpl implements UdiRelevanceService { @Resource UdiRelevanceDao udiRelevanceDao; @Resource 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 44ea84fa..0b44e2f1 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -27,6 +27,7 @@ import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiCalCountUtil; import net.sf.jasperreports.engine.JRException; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -742,181 +743,74 @@ public class IoCheckInoutService { public void genInv(IoOrderEntity orderEntity, BasicBussinessTypeEntity bussinessTypeEntity) { if (bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT) && bussinessTypeEntity.isScanPreIn()) { - ThreadUtil.execAsync(() -> { - List backCodeList = new ArrayList<>(); - List codeList = codeService.findByOrderId(orderEntity.getBillNo()); - for (IoCodeEntity codeEntity : codeList) { - int count = invPreinProductDetailService.findCountByCode(codeEntity.getCode()); - if (count > 0) { - codeEntity.setCount(count); - codeEntity.setReCount(udiCalCountUtil.getActCount(codeEntity.getNameCode())); - backCodeList.add(codeEntity); - } - } - BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); - if (StrUtil.isNotEmpty(basicBussinessTypeEntity.getPreInBackAction())) { - IoOrderEntity outOrder = new IoOrderEntity(); -// BeanUtils.copyProperties(orderEntity, outOrder); - outOrder.setId(null); - outOrder.setMainAction(ConstantType.TYPE_OUT); - outOrder.setAction(basicBussinessTypeEntity.getAction()); - outOrder.setCreateTime(new Date()); - outOrder.setFromType(ConstantStatus.FROM_CHANGE); - String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(basicBussinessTypeEntity.getPrefix()), "yyyyMMdd")); - outOrder.setBillNo(orderNo); - outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID); - outOrder.setCorpOrderId(CustomUtil.getId() + "x"); - outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); - orderEntity.setUllageSupNo(outOrder.getBillNo()); - orderEntity.setUpdateTime(new Date()); - orderService.update(orderEntity); - outOrder.setOriginUllageSupNo(orderEntity.getBillNo()); - outOrder.setCreateUser(null); - outOrder.setReviewUser(null); - orderService.insertOrder(outOrder); - - //生成条码 - List codeTempEntities = new ArrayList<>(); - for (IoCodeEntity warehouseEntity : backCodeList) { - IoCodeTempEntity codeTempEntity = new IoCodeTempEntity(); - BeanUtils.copyProperties(warehouseEntity, codeTempEntity); - codeTempEntity.setId(null); - codeTempEntity.setOrderId(outOrder.getBillNo()); - codeTempEntity.setAction(outOrder.getAction()); - codeTempEntity.setMainAction(outOrder.getMainAction()); - codeTempEntity.setCreateTime(new Date()); - codeTempEntity.setUpdateTime(new Date()); - codeTempEntities.add(codeTempEntity); + if (StrUtil.isNotEmpty(bussinessTypeEntity.getPreInBackAction())) { + if (bussinessTypeEntity.getBackPreinType() == 1) { //按单退货 + + String orderIds = bussinessTypeEntity.getCheckPreInOrders(); + if (StrUtil.isNotEmpty(orderIds)) { + String[] orderIdArray = StringUtils.split(","); + List orderList = CollUtil.toList(orderIdArray); + List outCodeEntitys = codeService.findByOrderId(orderEntity.getBillNo()); + List preInCodeEntities = codeService.findByOrderIds(orderList, null); + + // 扣减数量 + for (IoCodeEntity preInCodeEntity : preInCodeEntities) { + for (IoCodeEntity codeEntity : outCodeEntitys) { + if (preInCodeEntity.getCode().equals(codeEntity.getCode())) { + int count = preInCodeEntity.getMyCount() - codeEntity.getMyCount(); + int reCount = preInCodeEntity.getMyReCount() - codeEntity.getMyReCount(); + + if (count > 0) { + preInCodeEntity.setCount(count); + preInCodeEntity.setReCount(reCount); + codeEntity.setCount(0); + codeEntity.setReCount(0); + } else if (count < 0) { + preInCodeEntity.setCount(0); + preInCodeEntity.setReCount(0); + codeEntity.setCount(-count); + codeEntity.setReCount(-reCount); + } else { + preInCodeEntity.setCount(0); + preInCodeEntity.setReCount(0); + codeEntity.setCount(0); + codeEntity.setReCount(0); + } + } + } + + } + + List backCodeList = new ArrayList<>(); + for (IoCodeEntity codeEntity : preInCodeEntities) { + if (codeEntity.getMyCount() > 0) { + backCodeList.add(codeEntity); + } + } + genBackOrder(orderEntity, backCodeList); + + + } + + + } else { //按仓库货位退货 + List backCodeList = new ArrayList<>(); + List codeList = codeService.findByOrderId(orderEntity.getBillNo()); + for (IoCodeEntity codeEntity : codeList) { + int count = invPreinProductDetailService.findCountByCode(codeEntity.getCode()); + if (count > 0) { + codeEntity.setCount(count); + codeEntity.setReCount(udiCalCountUtil.getActCount(codeEntity.getNameCode())); + backCodeList.add(codeEntity); + genBackOrder(orderEntity, backCodeList); + } + } } - codeTempService.insertBatch(codeTempEntities); - addInoutService.dealProcess(outOrder); - if (!checkManual(outOrder.getBillNo())) { - check(outOrder.getBillNo()); - } - - } - - -// //找出UDI码对应的预验收入库单号 -// Map preInOrder = new HashMap<>(); -// for (IoCodeEntity warehouseEntity : codeList) { -// List invProductDetailEntities = invPreinDetailService.findByCode(warehouseEntity.getCode()); -// if (invProductDetailEntities.size() > 0) { -// for (InvPreinDetailEntity invPreinDetailEntity : invProductDetailEntities) -// preInOrder.put(invPreinDetailEntity.getOrderId(), invPreinDetailEntity.getOrderId()); -// } -// } -// if (preInOrder.size() > 0) { -// String preInBillNo = ""; -// boolean isBreak = false; -// -// for (String key : preInOrder.keySet()) { -// if (!isBreak) { -// preInBillNo = preInBillNo + "," + key; -// IoOrderEntity preInEntity = orderService.findByBillNo(key); -// preInEntity.setPreOutBillNo(orderEntity.getBillNo()); -// orderService.update(preInEntity); -// BasicBussinessTypeEntity preBusType = basicBussinessTypeService.findByAction(preInEntity.getAction()); -// //预验收不删除单号，方便后续查询 -// if (preBusType.isPreInBack()) { //预验收如果带回，则清空相关预验收库存； -// invPreinDetailService.deleteByOrderId(preInEntity.getBillNo()); -// //剩余UDI码生成退货单 todo -// List codeEntities = codeService.findByOrderId(key); -// backCodeList.addAll(codeEntities); -// } else { //预验收如果不带回，则清除已出库相关库存 -// for (IoCodeEntity codeEntity : codeList) { -// if (StrUtil.isEmpty(codeEntity.getSerialNo())) { -// InvPreinDetailEntity invPreinDetailEntity = invPreinDetailService.findByCode(key, codeEntity.getCode()); -// if (invPreinDetailEntity != null) { -// int count = 0; -// if (invPreinDetailEntity.getCount() < codeEntity.getCount()) { -// count = 0; -// } else { -// count = invPreinDetailEntity.getCount() - codeEntity.getCount(); -// } -// if (count >= 0) { -// isBreak = true; -// if (count == 0) { -// invPreinDetailService.deleteByCode(key, codeEntity.getCode()); -// } else { -// invPreinDetailEntity.setCount(count); -// invPreinDetailService.update(invPreinDetailEntity); -// } -// int reCount = invPreinDetailEntity.getReCount() - codeEntity.getMyReCount(); -// if (reCount == 0) { -// invPreinDetailService.deleteByCode(key, codeEntity.getCode()); -// } else { -// invPreinDetailEntity.setReCount(reCount); -// invPreinDetailService.update(invPreinDetailEntity); -// } -// } -// } -// } else { -// invPreinDetailService.deleteByCode(key, codeEntity.getCode()); -// } -// } -// -// } -// } -// -// -// } -// orderEntity.setPreInBillNo(preInBillNo.substring(1)); -// orderService.update(orderEntity); -// -// -// //生成退货单 1.查出所有关联的单据条码，2.扣减当前出库数量；3.生成单据类型对应绑定的出库单 -// if (CollUtil.isNotEmpty(backCodeList)) { -// List realBackCodeList = new ArrayList<>(); -// for (IoCodeEntity backCodeEntity : backCodeList) { -// for (IoCodeEntity codeEntity : codeList) { -// if (codeEntity.getCount() != 0 && backCodeEntity.getCode().equals(codeEntity.getCode())) { -// int count = backCodeEntity.getCount() - codeEntity.getCount(); -// int reCount = backCodeEntity.getReCount() - codeEntity.getReCount(); -// if (count > 0) { -// codeEntity.setCount(0); -// codeEntity.setReCount(0); -// backCodeEntity.setCount(count); -// backCodeEntity.setReCount(reCount); -// realBackCodeList.add(backCodeEntity); -// } else if (count == 0) { -// codeEntity.setCount(0); -// codeEntity.setReCount(0); -// } else if (count < 0) { -// codeEntity.setCount(-count); -// codeEntity.setReCount(-reCount); -// } -// } -// } -// -// } -// if (CollUtil.isNotEmpty(realBackCodeList)) { -// Map> backPreInOrder = new HashMap<>(); -// for (IoCodeEntity codeEntity : codeList) { -// List codeEntities = backPreInOrder.get(codeEntity.getOrderId()); -// if (CollUtil.isEmpty(codeEntities)) { -// codeEntities = new ArrayList<>(); -// } -// codeEntities.add(codeEntity); -// backPreInOrder.put(codeEntity.getOrderId(), codeEntities); -// } -// -// for (String key : backPreInOrder.keySet()) { -// IoOrderEntity originOrder = orderService.findByBillNo(key); -// BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(originOrder.getAction()); -// -// } -// } -// } -// } - - }); } - //校验是否是不入库存单据 if (bussinessTypeEntity.isInStock()) { //生成库存 @@ -931,10 +825,58 @@ public class IoCheckInoutService { //不入库存，直接进行单据流转 changeInoutService.changeOrder(orderEntity); } + } + + + public void genBackOrder(IoOrderEntity orderEntity, List backCodeList) { + if (CollUtil.isEmpty(backCodeList)) + return; + BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); + if (StrUtil.isNotEmpty(basicBussinessTypeEntity.getPreInBackAction())) { + IoOrderEntity outOrder = new IoOrderEntity(); + outOrder.setId(null); + outOrder.setMainAction(ConstantType.TYPE_OUT); + outOrder.setAction(basicBussinessTypeEntity.getAction()); + outOrder.setCreateTime(new Date()); + outOrder.setFromType(ConstantStatus.FROM_BACK); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(basicBussinessTypeEntity.getPrefix()), "yyyyMMdd")); + outOrder.setBillNo(orderNo); + outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID); + outOrder.setCorpOrderId(CustomUtil.getId() + "x"); + outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); + orderEntity.setUllageSupNo(outOrder.getBillNo()); + orderEntity.setUpdateTime(new Date()); + orderService.update(orderEntity); + outOrder.setOriginUllageSupNo(orderEntity.getBillNo()); + outOrder.setCreateUser(null); + outOrder.setReviewUser(null); + orderService.insertOrder(outOrder); + + //生成条码 + List codeTempEntities = new ArrayList<>(); + for (IoCodeEntity warehouseEntity : backCodeList) { + IoCodeTempEntity codeTempEntity = new IoCodeTempEntity(); + BeanUtils.copyProperties(warehouseEntity, codeTempEntity); + codeTempEntity.setId(null); + codeTempEntity.setOrderId(outOrder.getBillNo()); + codeTempEntity.setAction(outOrder.getAction()); + codeTempEntity.setMainAction(outOrder.getMainAction()); + codeTempEntity.setCreateTime(new Date()); + codeTempEntity.setUpdateTime(new Date()); + codeTempEntities.add(codeTempEntity); + } + codeTempService.insertBatch(codeTempEntities); + addInoutService.dealProcess(outOrder); + if (!checkManual(outOrder.getBillNo())) { + check(outOrder.getBillNo()); + } + + } } + // 预验收使用出库处理1.不带回扣库存;2.带回时生成退货出库单 @Resource GennerOrderUtils gennerOrderUtils; diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeService.java b/src/main/java/com/glxp/api/service/inout/IoCodeService.java index 0f0bb567..c04f895b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCodeService.java @@ -21,6 +21,10 @@ public interface IoCodeService { public IoCodeEntity findByUnique(String orderId, String code); + List findByOrderIds(List orderIds, String code); + + int findByOrderIdsCount(List orderIds, String code); + boolean isExitByRelId(String relId); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java index 2f22809f..023b4e6f 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.inout.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; @@ -66,6 +67,30 @@ public class IoCodeServiceImpl implements IoCodeService { return ioCodeDao.selectOne(new QueryWrapper().eq("orderId", orderId).eq("code", code)); } + @Override + public List findByOrderIds(List orderIds, String code) { + + if (StrUtil.isNotEmpty(code)) + return ioCodeDao.selectList(new QueryWrapper().eq("code", code).in("orderId", orderIds)); + else { + return ioCodeDao.selectList(new QueryWrapper().in("orderId", orderIds)); + } + } + + @Override + public int findByOrderIdsCount(List orderIds, String code) { + List codeEntities = findByOrderIds(orderIds, code); + if (CollUtil.isNotEmpty(codeEntities)) { + int count = 0; + for (IoCodeEntity codeEntity : codeEntities) { + count = count + codeEntity.getMyCount(); + } + + return count; + } + return 0; + } + @Override public boolean isExitByRelId(String relId) { // return ioCodeDao.selectList(new QueryWrapper().eq("relId", relId).last("limit 1")); diff --git a/src/main/java/com/glxp/api/service/purchase/SupCertService.java b/src/main/java/com/glxp/api/service/purchase/SupCertService.java index 693cfbba..ec2c80ce 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupCertService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupCertService.java @@ -3,13 +3,14 @@ package com.glxp.api.service.purchase; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.req.purchase.FilterSupCertRequest; import com.glxp.api.req.purchase.purPlanPrintRequest; import java.util.List; -public interface SupCertService { +public interface SupCertService extends IService { List filterCompanyCert(FilterSupCertRequest filterSupCertRequest); diff --git a/src/main/java/com/glxp/api/service/purchase/SupCertSetService.java b/src/main/java/com/glxp/api/service/purchase/SupCertSetService.java index 30d345d3..b25a1ca8 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupCertSetService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupCertSetService.java @@ -1,14 +1,13 @@ package com.glxp.api.service.purchase; - - +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.purchase.SupCertSetEntity; import com.glxp.api.req.purchase.FilterCertSetsRequest; import java.util.List; -public interface SupCertSetService { +public interface SupCertSetService extends IService { List filterCertSets(FilterCertSetsRequest filterCertSetsRequest); diff --git a/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java b/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java index 7f5ba1f5..a71f11f1 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java @@ -2,12 +2,13 @@ package com.glxp.api.service.purchase; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.purchase.SupCompanyEntity; import com.glxp.api.req.purchase.FilterSupCompanyRequest; import java.util.List; -public interface SupCompanyService { +public interface SupCompanyService extends IService { SupCompanyEntity findCompanyByUnitFk(String unitFk); diff --git a/src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java b/src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java index e868eb17..92565da4 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java @@ -1,14 +1,13 @@ package com.glxp.api.service.purchase; - - +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.purchase.SupManufacturerEntity; import com.glxp.api.req.purchase.FilterSupManufacturerRequest; import java.util.List; -public interface SupManufacturerService { +public interface SupManufacturerService extends IService { SupManufacturerEntity findCompany(Long id); diff --git a/src/main/java/com/glxp/api/service/purchase/SupProductService.java b/src/main/java/com/glxp/api/service/purchase/SupProductService.java index 3cdcc6bc..d27a20df 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupProductService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupProductService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.purchase; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.purchase.SupProductEntity; import com.glxp.api.req.purchase.FilterPoductRequest; import com.glxp.api.res.purchase.SupProductResponse; @@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; -public interface SupProductService { +public interface SupProductService extends IService { SupProductEntity findRegistration(Long id); diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java index a9447556..c11da807 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.purchase.impl; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.purchase.SupCertDao; @@ -17,7 +18,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class SupCertServiceImpl implements SupCertService { +public class SupCertServiceImpl extends ServiceImpl implements SupCertService { @Resource SupCertDao supCertDao; @@ -33,6 +34,7 @@ public class SupCertServiceImpl implements SupCertService { } return supCertDao.filterCompanyCert(filterSupCertRequest); } + @Override public List selectCompanyCert(FilterSupCertRequest filterSupCertRequest) { if (filterSupCertRequest == null) { @@ -110,8 +112,8 @@ public class SupCertServiceImpl implements SupCertService { } @Override - public boolean updateCustomerId(String oldId, String newId,Integer auditStatus) { - return supCertDao.updateCustomerId(oldId, newId,auditStatus); + public boolean updateCustomerId(String oldId, String newId, Integer auditStatus) { + return supCertDao.updateCustomerId(oldId, newId, auditStatus); } @Override diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java index 64e460b5..ce8be576 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.purchase.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.SupCertSetDao; import com.glxp.api.entity.purchase.SupCertSetEntity; @@ -14,7 +15,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class SupCertSetServiceImpl implements SupCertSetService { +public class SupCertSetServiceImpl extends ServiceImpl implements SupCertSetService { @Resource SupCertSetDao supCertSetDao; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java index a53f54bb..d9554d6b 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.purchase.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.SupCompanyDao; import com.glxp.api.entity.purchase.SupCompanyEntity; @@ -14,7 +15,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class SupCompanyServiceImpl implements SupCompanyService { +public class SupCompanyServiceImpl extends ServiceImpl implements SupCompanyService { @Resource SupCompanyDao supCompanyDao; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java index cd7d5dc1..d75d7b3c 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.purchase.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.SupManufacturerDao; import com.glxp.api.entity.purchase.SupManufacturerEntity; @@ -16,7 +17,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class SupManufacturerServiceImpl implements SupManufacturerService { +public class SupManufacturerServiceImpl extends ServiceImpl implements SupManufacturerService { @Resource SupManufacturerDao supManufacturerDao; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java index b46f88ad..8188e72d 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java @@ -3,6 +3,7 @@ package com.glxp.api.service.purchase.impl; import cn.hutool.core.collection.CollUtil; 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.constant.ConstantStatus; import com.glxp.api.dao.purchase.SupProductDao; @@ -19,7 +20,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class SupProductServiceImpl implements SupProductService { +public class SupProductServiceImpl extends ServiceImpl implements SupProductService { @Resource SupProductDao supProductDao; @@ -82,17 +83,17 @@ public class SupProductServiceImpl implements SupProductService { } @Override - public SupProductEntity findByManufactury(String cpmctymc, String manufactory,String manufacturerIdFk) { + public SupProductEntity findByManufactury(String cpmctymc, String manufactory, String manufacturerIdFk) { - QueryWrapper ew=new QueryWrapper<>(); - if(StrUtil.isNotEmpty(manufactory)){ - ew.eq("manufactory",manufactory); + QueryWrapper ew = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(manufactory)) { + ew.eq("manufactory", manufactory); } - if(StrUtil.isNotEmpty(cpmctymc)){ - ew.eq("recordProductName",cpmctymc); + if (StrUtil.isNotEmpty(cpmctymc)) { + ew.eq("recordProductName", cpmctymc); } - if(StrUtil.isNotEmpty(manufacturerIdFk)){ - ew.eq("manufacturerIdFk",manufacturerIdFk); + if (StrUtil.isNotEmpty(manufacturerIdFk)) { + ew.eq("manufacturerIdFk", manufacturerIdFk); } ew.last("limit 1"); List supProductEntities = supProductDao.selectList(ew); diff --git a/src/main/java/com/glxp/api/service/sync/BasicExportService.java b/src/main/java/com/glxp/api/service/sync/BasicExportService.java index 3ad25fc6..6d43f5a9 100644 --- a/src/main/java/com/glxp/api/service/sync/BasicExportService.java +++ b/src/main/java/com/glxp/api/service/sync/BasicExportService.java @@ -1,12 +1,14 @@ package com.glxp.api.service.sync; +import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.dao.sync.BasicExportDao; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.req.sync.BasicExportStatusRequest; import java.util.List; -public interface BasicExportService { +public interface BasicExportService extends IService { BasicExportStatusEntity findByData(String idDatas, Integer status); diff --git a/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java b/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java index 36d9a74f..ad59f442 100644 --- a/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java +++ b/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java @@ -1,12 +1,13 @@ package com.glxp.api.service.sync; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.req.sync.BasicExportTimeRequest; import java.util.List; -public interface BasicExportTimeService { +public interface BasicExportTimeService extends IService { BasicExportStatusTimeEntity findByType(String type); diff --git a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java index 2186961b..7fbce9fb 100644 --- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java +++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java @@ -1,14 +1,17 @@ package com.glxp.api.service.sync; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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.entity.basic.ProductInfoEntity; -import com.glxp.api.entity.basic.UdiCompanyEntity; +import com.glxp.api.constant.*; +import com.glxp.api.dao.basic.BasicProductsDao; +import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inout.*; +import com.glxp.api.entity.purchase.*; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.entity.sync.SyncDataBustypeEntity; @@ -19,25 +22,39 @@ import com.glxp.api.req.sync.SpsSyncDataRequest; import com.glxp.api.res.sync.SpSyncUdiResponse; import com.glxp.api.res.sync.SpsSyncOrderResponse; import com.glxp.api.res.system.SyncDataSetResponse; -import com.glxp.api.service.basic.ProductInfoService; -import com.glxp.api.service.basic.UdiCompanyService; +import com.glxp.api.service.basic.*; import com.glxp.api.service.inout.*; +import com.glxp.api.service.purchase.*; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; +import com.glxp.api.util.JsonUtils; +import com.glxp.api.util.RedisUtil; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.*; +import java.util.function.Function; @Slf4j @Service +@RequiredArgsConstructor public class SpsSyncDownloadService { + private final Logger logger = LoggerFactory.getLogger(SpsSyncDownloadService.class); + + + private final RedisUtil redisUtil; + //已完成扫码单据 @Resource IoOrderService orderService; @@ -109,6 +126,353 @@ public class SpsSyncDownloadService { } + private final BasicHospTypeService hospTypeService; + + private final UdiRelevanceService udiRelevanceService; + + private final BasicProductsDao basicProductsDao; + + private final CompanyProductRelevanceService relevanceService; + + private final BasicCorpService corpService; + + private final SupCertService supCertService; + + private final SupCertSetService supCertSetService; + + private final SupCompanyService supCompanyService; + + private final SupManufacturerService supManufacturerService; + + private final SupProductService supProductService; + + @Value("${file_path}") + private String filePath; + + /** + * 同步基础数据模块 + * + * @param info 同步设置 + */ + public void syncBasicData(SyncDataSetResponse info) { + + Date now = new Date(); + //是否需要执行 + boolean needExec = info.getBasicProducts() == 2 || info.getBasicCorp() == 2 || info.getSupCert() == 2; + if (!needExec) { + return; + } + try { + basicExportInfoCreate(BasicExportTypeEnum.BASIC_DATA, now, this.getClass() + , x -> x.generateBasicDataFile(info, now, false) + , x -> x.generateBasicDataFile(info, now, true)); + } catch (Exception e) { + throw new RuntimeException(e); + } + + } + + /** + * 创建一个同步任务 + * + * @param exportEnum 任务类型枚举 + * @param hasDataMethod 判断时候有无数据方法 + * @param createFileMethod 执行文件生成方法 + * @return + * @throws Exception + */ + private void basicExportInfoCreate(BasicExportTypeEnum exportEnum, Date now + , Class clazz, Function hasDataMethod, Function createFileMethod) throws Exception { + //防止出现同时调用问题 + String redisKey = String.format("spsm-sync-create:%s", exportEnum.getKey()); + boolean result = redisUtil.setIfAbsent(redisKey, 1, 10); + if (!result) { + String errorMsg = String.format("syncIdcSps----process------------同步[%s]重复进入", exportEnum.getRemark()); +// logger.info(errorMsg); + throw new Exception(errorMsg); + } + BasicExportStatusEntity exportStatus = basicExportService.getOne(Wrappers.lambdaQuery(BasicExportStatusEntity.class) + .eq(BasicExportStatusEntity::getType, BasicExportTypeEnum.BASIC_DATA.getRemark()) + .orderByDesc(BasicExportStatusEntity::getStartTime) + .last("limit 1") + ); + + //首次任务or上次任务结束 + if (exportStatus == null || BasicExportStatusEnum.COMPLETED.getCode().equals(exportStatus.getStatus())) { + + //判断有无新数据 + Boolean hasData = hasDataMethod.apply(this); + if (Boolean.FALSE.equals(hasData)) { + return; + } + exportStatus = BasicExportStatusEntity.builder() + .id(CustomUtil.getId()) + .status(BasicExportStatusEnum.WAIT_TRIGGERED.getCode()) + .type(BasicExportTypeEnum.BASIC_DATA.getRemark()) + .scheduleType(0) + .updateTime(cn.hutool.core.date.DateUtil.date()) + .startTime(now) + .build(); + basicExportService.save(exportStatus); + } else if (exportStatus.getStatus().equals(BasicExportStatusEnum.WAIT_BUILT.getCode())) {//文件待生成 + createFileMethod.apply(this); + } + } + + /** + * 读取基础数据，创建文件 + * + * @param info 同步设置信息 + * @param now 当前时间 + * @param createFile 是否创建文件 + * @return 是否有数据 true/false 有新数据/无新数据 + */ + protected boolean generateBasicDataFile(SyncDataSetResponse info, Date now, boolean createFile) { + //文件数据 + Map jsonMap = new WeakHashMap<>(4); + Map> totalTimeMap = new WeakHashMap<>(10); + try { + //确认有开启物资字典由外向内同步 + if (info.getBasicProducts() == 2) { + Map map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_PRODUCTS, createFile); + totalTimeMap.put(BasicExportStatusTimeEnum.BASIC_PRODUCTS, map); + List hospTypeList = hospTypeService.list(Wrappers.lambdaQuery(BasicHospTypeEntity.class) + .le((boolean) map.get("isNew"), BasicHospTypeEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), BasicHospTypeEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(hospTypeList)) { + jsonMap.put(BasicExportStatusTimeEntity.class.getName(), hospTypeList); + } + List udiRelevanceList = udiRelevanceService.list(Wrappers.lambdaQuery(UdiRelevanceEntity.class) + .le((boolean) map.get("isNew"), UdiRelevanceEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), UdiRelevanceEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(udiRelevanceList)) { + jsonMap.put(UdiRelevanceEntity.class.getName(), udiRelevanceList); + } + List productsList = basicProductsDao.selectList(Wrappers.lambdaQuery(BasicProductsEntity.class) + .le((boolean) map.get("isNew"), BasicProductsEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), BasicProductsEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(productsList)) { + jsonMap.put(BasicProductsEntity.class.getName(), productsList); + } + List relevanceList = relevanceService.list(Wrappers.lambdaQuery(CompanyProductRelevanceEntity.class) + .le((boolean) map.get("isNew"), CompanyProductRelevanceEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), CompanyProductRelevanceEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(relevanceList)) { + jsonMap.put(CompanyProductRelevanceEntity.class.getName(), relevanceList); + } + } + //确认有开启往来单位字典同步 + if (info.getBasicCorp() == 2) { + Map map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_CORP, createFile); + totalTimeMap.put(BasicExportStatusTimeEnum.BASIC_CORP, map); + List corpList = corpService.list(Wrappers.lambdaQuery(BasicCorpEntity.class) + .le((boolean) map.get("isNew"), BasicCorpEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), BasicCorpEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(corpList)) { + jsonMap.put(BasicCorpEntity.class.getName(), corpList); + } + } + + //确认有开启首营资质同步 + if (info.getSupCert() == 2) { + Map map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SUP_CERT, createFile); + totalTimeMap.put(BasicExportStatusTimeEnum.SUP_CERT, map); + List supCertList = supCertService.list(Wrappers.lambdaQuery(SupCertEntity.class) + .le((boolean) map.get("isNew"), SupCertEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), SupCertEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(supCertList)) { + jsonMap.put(SupCertEntity.class.getName(), supCertList); + } + List supCertSetList = supCertSetService.list(Wrappers.lambdaQuery(SupCertSetEntity.class) + .le((boolean) map.get("isNew"), SupCertSetEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), SupCertSetEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(supCertSetList)) { + jsonMap.put(SupCertSetEntity.class.getName(), supCertSetList); + } + List supCompanyList = supCompanyService.list(Wrappers.lambdaQuery(SupCompanyEntity.class) + .le((boolean) map.get("isNew"), SupCompanyEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), SupCompanyEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(supCompanyList)) { + jsonMap.put(SupCompanyEntity.class.getName(), supCompanyList); + } + List supManufacturerList = supManufacturerService.list(Wrappers.lambdaQuery(SupManufacturerEntity.class) + .le((boolean) map.get("isNew"), SupManufacturerEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), SupManufacturerEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(supManufacturerList)) { + jsonMap.put(SupManufacturerEntity.class.getName(), supManufacturerList); + } + List supProductList = supProductService.list(Wrappers.lambdaQuery(SupProductEntity.class) + .le((boolean) map.get("isNew"), SupProductEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), SupProductEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(supProductList)) { + jsonMap.put(SupProductEntity.class.getName(), supProductList); + } + + } + + if (jsonMap.size() > 0) { + if (!createFile) { + return true; + } + try { + String fileFullPath = writeFile(filePath, BasicExportTypeEnum.BASIC_DATA.getRemark(), JsonUtils.toJsonString(jsonMap)); + //计算总数 + int total = 0; + for (List l : jsonMap.values()) { + total += l.size(); + } + try { + //插入一条任务数据 + boolean update = basicExportService.update(Wrappers.lambdaUpdate(BasicExportStatusEntity.class) + .set(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.WAIT_SYNC.getCode()) + .set(BasicExportStatusEntity::getUpdateTime, new Date()) + .set(BasicExportStatusEntity::getCacheFilePath, fileFullPath) + .set(BasicExportStatusEntity::getRemark, String.format("%s: %s条", BasicExportStatusEnum.WAIT_SYNC.getRemark(), total)) + .eq(BasicExportStatusEntity::getType, BasicExportTypeEnum.BASIC_DATA.getRemark()) + .eq(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.WAIT_BUILT.getCode()) + .isNull(BasicExportStatusEntity::getCacheFilePath) + ); + } catch (Exception e) { + // 异常回滚 + this.exportTimeRollback(totalTimeMap, BasicExportTypeEnum.BASIC_DATA, fileFullPath); + } + return true; + } catch (IOException e) { + logger.error(String.format("syncIdcSps----process------------生成[%s]文件及更改库操作异常，异常信息<%s>" + , BasicExportTypeEnum.BASIC_DATA.getRemark(), e.getMessage())); + // 异常回滚 + this.exportTimeRollback(totalTimeMap, BasicExportTypeEnum.BASIC_DATA, null); + } + } + return false; + } catch (Exception e) { + logger.error(e.getMessage()); + return false; + } + } + + /** + * 插入 basicExportStatusTime表 + * + * @param date 当前时间 + * @param exportStatusTimeEnum key枚举 + * @param createFile 是否需要创建文件，false时只做查询 + * @return 最后一次同步时间 返回值需与参数 date 比较，判断是否相等 + * @throws Exception + */ + private Map basicExportStatusTimeInfo(Date date, BasicExportStatusTimeEnum exportStatusTimeEnum, boolean createFile) throws Exception { + //防止出现同时调用问题 + String redisKey = String.format("spsm-sync-task:%s", exportStatusTimeEnum.getKey()); + boolean result = redisUtil.setIfAbsent(redisKey, 1, 10); + if (!result) { + String errorMsg = String.format("syncIdcSps----process------------同步[%s]重复进入", exportStatusTimeEnum.getRemark()); +// logger.info(errorMsg); + throw new Exception(errorMsg); + } + boolean isNew = true; + BasicExportStatusTimeEntity timeInfo = basicExportTimeService.getOne(Wrappers.lambdaQuery(BasicExportStatusTimeEntity.class) + .eq(BasicExportStatusTimeEntity::getKey, exportStatusTimeEnum.getKey())); + if (timeInfo == null) { + timeInfo = BasicExportStatusTimeEntity.builder() + .key(exportStatusTimeEnum.getKey()) + .lastUpdateTime(DateUtil.formatDateTime(date)) + .remark(exportStatusTimeEnum.getRemark()) + .build(); + if (createFile) { + basicExportTimeService.save(timeInfo); + } + } else { + if (StrUtil.isNotEmpty(timeInfo.getLastUpdateTime())) { + isNew = false; + } + if (createFile) { + basicExportTimeService.update(Wrappers.lambdaUpdate(BasicExportStatusTimeEntity.class) + .set(BasicExportStatusTimeEntity::getLastUpdateTime, DateUtil.formatDateTime(date)) + .eq(BasicExportStatusTimeEntity::getKey, exportStatusTimeEnum.getKey()) + ); + } + } + redisUtil.del(redisKey); + WeakHashMap returnMap = new WeakHashMap<>(10); + returnMap.put("isNew", isNew); + returnMap.put("oldDate", isNew ? null : timeInfo.getLastUpdateTime()); + returnMap.put("id", timeInfo.getId()); + + return returnMap; + } + + /** + * 异常回滚操作 + * + * @param totalTimeMap 总的exportTime数据回滚 + * @param delFilePath 需要删除的文件地址 + */ + private void exportTimeRollback(Map> totalTimeMap, BasicExportTypeEnum exportType, String delFilePath) { + for (Map.Entry> entry : totalTimeMap.entrySet()) { + //防止出现同时调用问题 + String redisKey = String.format("spsm-sync-rollback:%s", entry.getKey().getKey()); + boolean result = redisUtil.setIfAbsent(redisKey, 1, 10); + if (!result) { + String errorMsg = String.format("syncIdcSps----process------------同步回滚[%s]重复进入", entry.getKey().getRemark()); + logger.error(errorMsg); + } + if ((boolean) entry.getValue().get("isNew")) { + basicExportTimeService.deleteById(entry.getValue().get("id").toString()); + } else { + basicExportTimeService.update(Wrappers.lambdaUpdate(BasicExportStatusTimeEntity.class) + .set(BasicExportStatusTimeEntity::getLastUpdateTime, entry.getValue().get("oldDate")) + .eq(BasicExportStatusTimeEntity::getKey, entry.getKey().getKey()) + .eq(BasicExportStatusTimeEntity::getId, entry.getValue().get("id")) + ); + } + } + if (StrUtil.isNotBlank(delFilePath)) { + try { + File file = new File(delFilePath); + file.deleteOnExit(); + } catch (Exception e) { + String errorMsg = String.format("syncIdcSps----process------------同步回滚[%s]删除文件异常", exportType.getRemark()); + logger.error(errorMsg); + } + } + + } + + + private String writeFile(String filePath, String fileDesc, String content) throws IOException { + String fileFullPath = String.format("%s/%s/%s-%s.udi", filePath, DateUtil.getDate(), fileDesc, IdUtil.fastSimpleUUID()); + File file = new File(fileFullPath); + while (!file.createNewFile()) { + fileFullPath = String.format("%s/%s/%s-%s.udi", filePath, DateUtil.getDate(), fileDesc, IdUtil.fastSimpleUUID()); + file = new File(fileFullPath); + } + FileWriter fileWriter = new FileWriter(file); + fileWriter.write(content); + fileWriter.flush(); + fileWriter.close(); + return fileFullPath; + } + //获取需要同步信息 public BaseResponse findOrder(SpsSyncDataRequest spsSyncDataRequest) { SpsSyncOrderResponse syncOrderResponse = new SpsSyncOrderResponse(); @@ -229,4 +593,5 @@ public class SpsSyncDownloadService { spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); return spsSyncDataRequest; } + } diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java index a4a94d3a..632eaa16 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.sync.impl; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.sync.BasicExportDao; import com.glxp.api.entity.sync.BasicExportStatusEntity; @@ -15,7 +16,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class BasicExportServiceImpl implements BasicExportService { +public class BasicExportServiceImpl extends ServiceImpl implements BasicExportService { @Resource BasicExportDao basicExportDao; diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java index 8113f18e..58a5351e 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.sync.impl; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.sync.BasicExportTimeDao; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.req.sync.BasicExportTimeRequest; @@ -14,7 +15,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class BasicExportTimeServiceImpl implements BasicExportTimeService { +public class BasicExportTimeServiceImpl extends ServiceImpl implements BasicExportTimeService { @Resource BasicExportTimeDao basicExportTimeDao; diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java index 4e8bdd5f..9d3c1e12 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java @@ -1,16 +1,15 @@ package com.glxp.api.service.system.impl; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.api.dao.system.SysPdfTemplateRelevanceBizDao; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; -import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import com.glxp.api.service.system.SystemPDFTemplateRelevanceBizService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -23,11 +22,11 @@ public class SystemPDFTemplateRelevanceBizServiceImpl implements SystemPDFTempla @Override public List getListByModelId(Integer modelId) { - QueryWrapper ew=new QueryWrapper(); - if(modelId!=null){ - ew.eq("moduleId",modelId); + QueryWrapper ew = new QueryWrapper(); + if (modelId != null) { + ew.eq("moduleId", modelId); } - List sysPdfTemplateRelevanceBizEntityList=sysPdfTemplateRelevanceBizDao.selectList(ew); + List sysPdfTemplateRelevanceBizEntityList = sysPdfTemplateRelevanceBizDao.selectList(ew); return sysPdfTemplateRelevanceBizEntityList; } @@ -39,19 +38,19 @@ public class SystemPDFTemplateRelevanceBizServiceImpl implements SystemPDFTempla @Override public boolean udpateRl(SysPdfTemplateRelevanceBizEntity systemPDFTemplateRelevanceEntity) { + systemPDFTemplateRelevanceEntity.setUpdateTime(new Date()); + int count = sysPdfTemplateRelevanceBizDao.updateById(systemPDFTemplateRelevanceEntity); - int count= sysPdfTemplateRelevanceBizDao.updateById(systemPDFTemplateRelevanceEntity); - - if(count>0){ - return true; - }else{ - return false; - } + if (count > 0) { + return true; + } else { + return false; + } } @Override public boolean insert(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity) { - + sysPdfTemplateRelevanceBizEntity.setUpdateTime(new Date()); sysPdfTemplateRelevanceBizDao.upInsert(sysPdfTemplateRelevanceBizEntity); return true; diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java index 90cf3402..0d873782 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java @@ -1,18 +1,15 @@ package com.glxp.api.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.glxp.api.dao.system.SysPdfTemplateRelevanceBizDao; import com.glxp.api.dao.system.SysPdfTemplateRelevanceCodeDao; -import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; -import com.glxp.api.service.system.SystemPDFTemplateRelevanceBizService; import com.glxp.api.service.system.SystemPDFTemplateRelevanceCodeService; -import com.glxp.api.service.system.SystemPDFTemplateRelevanceService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -25,11 +22,11 @@ public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTempl @Override public List getListByModelId(Integer modelId) { - QueryWrapper ew=new QueryWrapper(); - if(modelId!=null){ - ew.eq("moduleId",modelId); + QueryWrapper ew = new QueryWrapper(); + if (modelId != null) { + ew.eq("moduleId", modelId); } - List sysPdfTemplateRelevanceCodeEntityList=sysPdfTemplateRelevanceCodeDao.selectList(ew); + List sysPdfTemplateRelevanceCodeEntityList = sysPdfTemplateRelevanceCodeDao.selectList(ew); return sysPdfTemplateRelevanceCodeEntityList; } @@ -42,34 +39,34 @@ public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTempl @Override public List selectList(FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) { - QueryWrapper ew=new QueryWrapper<>(); - if(filterPdfTemplateRelevanceRequest.getModelKey()!=null){ - ew.eq("modelKey",filterPdfTemplateRelevanceRequest.getModelKey()); + QueryWrapper ew = new QueryWrapper<>(); + if (filterPdfTemplateRelevanceRequest.getModelKey() != null) { + ew.eq("modelKey", filterPdfTemplateRelevanceRequest.getModelKey()); } return sysPdfTemplateRelevanceCodeDao.selectList(ew); } @Override public boolean udpateRl(SysPdfTemplateRelevanceCodeEntity systemPDFTemplateRelevanceEntity) { + systemPDFTemplateRelevanceEntity.setUpdateTime(new Date()); + int count = sysPdfTemplateRelevanceCodeDao.updateById(systemPDFTemplateRelevanceEntity); - int count= sysPdfTemplateRelevanceCodeDao.updateById(systemPDFTemplateRelevanceEntity); - - if(count>0){ - return true; - }else{ - return false; - } + if (count > 0) { + return true; + } else { + return false; + } } @Override public boolean insert(SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity) { - + sysPdfTemplateRelevanceCodeEntity.setUpdateTime(new Date()); sysPdfTemplateRelevanceCodeDao.upInsert(sysPdfTemplateRelevanceCodeEntity); return false; } @Override public SysPdfTemplateRelevanceCodeEntity selectNameAndAction(String name, String localAction) { - return sysPdfTemplateRelevanceCodeDao.selectNameAndAction(name,localAction); + return sysPdfTemplateRelevanceCodeDao.selectNameAndAction(name, localAction); } } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java index 7c8d5a80..a1351901 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java @@ -6,10 +6,10 @@ import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import com.glxp.api.service.system.SystemPDFTemplateRelevanceLabelService; -import com.glxp.api.service.system.SystemPDFTemplateRelevanceLabelService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -22,11 +22,11 @@ public class SystemPDFTemplateRelevanceLabelServiceImpl implements SystemPDFTemp @Override public List getListByModelId(Integer modelId) { - QueryWrapper ew=new QueryWrapper(); - if(modelId!=null){ - ew.eq("moduleId",modelId); + QueryWrapper ew = new QueryWrapper(); + if (modelId != null) { + ew.eq("moduleId", modelId); } - List sysPdfTemplateRelevanceLabelEntityList=sysPdfTemplateRelevanceLabelDao.selectList(ew); + List sysPdfTemplateRelevanceLabelEntityList = sysPdfTemplateRelevanceLabelDao.selectList(ew); return sysPdfTemplateRelevanceLabelEntityList; } @@ -38,13 +38,13 @@ public class SystemPDFTemplateRelevanceLabelServiceImpl implements SystemPDFTemp @Override public boolean udpateRl(SysPdfTemplateRelevanceLabelEntity systemPDFTemplateRelevanceEntity) { + systemPDFTemplateRelevanceEntity.setUpdateTime(new Date()); + int count = sysPdfTemplateRelevanceLabelDao.updateById(systemPDFTemplateRelevanceEntity); - int count= sysPdfTemplateRelevanceLabelDao.updateById(systemPDFTemplateRelevanceEntity); - - if(count>0){ - return true; - }else{ - return false; - } + if (count > 0) { + return true; + } else { + return false; + } } } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java index c256b44c..0025bd03 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java @@ -6,10 +6,10 @@ import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import com.glxp.api.service.system.SystemPDFTemplateRelevanceStatemenService; -import com.glxp.api.service.system.SystemPDFTemplateRelevanceStatemenService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -22,11 +22,11 @@ public class SystemPDFTemplateRelevanceStatemenServiceImpl implements SystemPDFT @Override public List getListByModelId(Integer modelId) { - QueryWrapper ew=new QueryWrapper(); - if(modelId!=null){ - ew.eq("moduleId",modelId); + QueryWrapper ew = new QueryWrapper(); + if (modelId != null) { + ew.eq("moduleId", modelId); } - List sysPdfTemplateRelevanceStatemenEntityList=sysPdfTemplateRelevanceStatemenDao.selectList(ew); + List sysPdfTemplateRelevanceStatemenEntityList = sysPdfTemplateRelevanceStatemenDao.selectList(ew); return sysPdfTemplateRelevanceStatemenEntityList; } @@ -38,13 +38,13 @@ public class SystemPDFTemplateRelevanceStatemenServiceImpl implements SystemPDFT @Override public boolean udpateRl(SysPdfTemplateRelevanceStatemenEntity systemPDFTemplateRelevanceEntity) { + systemPDFTemplateRelevanceEntity.setUpdateTime(new Date()); + int count = sysPdfTemplateRelevanceStatemenDao.updateById(systemPDFTemplateRelevanceEntity); - int count= sysPdfTemplateRelevanceStatemenDao.updateById(systemPDFTemplateRelevanceEntity); - - if(count>0){ - return true; - }else{ - return false; - } + if (count > 0) { + return true; + } else { + return false; + } } } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java index 70c99d24..bc1d8421 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -69,18 +70,18 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService { @Override public boolean updateById(SysParamConfigSaveRequest sysParamConfigSaveRequest) { - + sysParamConfigSaveRequest.setUpdateTime(new Date()); return systemParamConfigDao.updateById(sysParamConfigSaveRequest); } @Override public boolean updateParentId(SysParamConfigSaveRequest sysParamConfigSaveRequest) { - return systemParamConfigDao.updateParentId(sysParamConfigSaveRequest); } @Override public boolean insert(SystemParamConfigEntity systemParamConfigEntity) { + systemParamConfigEntity.setUpdateTime(new Date()); return systemParamConfigDao.insert(systemParamConfigEntity); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java index af40e60f..606c229f 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java @@ -13,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; @Service @@ -79,6 +80,7 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService { @Override public boolean insertThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity) { + thrInvWarehouseEntity.setUpdateTime(new Date()); return thrInvWarehouseDao.insertThrInvWarehouse(thrInvWarehouseEntity); } @@ -89,6 +91,7 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService { @Override public boolean updateThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity) { + thrInvWarehouseEntity.setUpdateTime(new Date()); return thrInvWarehouseDao.updateThrInvWarehouse(thrInvWarehouseEntity); } diff --git a/src/main/java/com/glxp/api/task/AsyncHeartTask.java b/src/main/java/com/glxp/api/task/AsyncHeartTask.java index 9680a655..cf02bcb2 100644 --- a/src/main/java/com/glxp/api/task/AsyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/AsyncHeartTask.java @@ -67,7 +67,7 @@ public class AsyncHeartTask implements SchedulingConfigurer { if (curTime - lastTime > timeInterval) { spsSyncDownloadService.syncDiProductsTask(); // todo 生成任务都写在这 - + spsSyncDownloadService.syncBasicData(syncDataSetEntity); redisUtil.set("SPS_SYNC_GEN_DATA", curTime); } } diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index 2a3f13f7..cfa6f2ca 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -46,7 +46,7 @@ SELECT * FROM auth_user - userName = #{userName} + binary userName = #{userName} LIMIT 1 diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml index cbf99ff2..5a742cba 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml @@ -30,4 +30,71 @@ + + + insert into basic_bustype_change + + + id, + + originAction, + originName, + targetAction, + `type`, + `enable`, + `createUser`, + updateUser, + createTime, + updateTime, + remark, + auditStatus, + busAuditStatus, + targetBusAction, + beforeTime, + busBeforeTime, + + values + + + #{id,jdbcType=INTEGER}, + + #{originAction,jdbcType=VARCHAR}, + #{originName,jdbcType=VARCHAR}, + #{targetAction,jdbcType=VARCHAR}, + #{type,jdbcType=TINYINT}, + #{enable,jdbcType=TINYINT}, + #{createUser,jdbcType=VARCHAR}, + #{updateUser,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}, + #{remark,jdbcType=VARCHAR}, + #{auditStatus,jdbcType=TINYINT}, + #{busAuditStatus,jdbcType=TINYINT}, + #{targetBusAction,jdbcType=VARCHAR}, + #{beforeTime,jdbcType=TINYINT}, + #{busBeforeTime,jdbcType=TINYINT}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + originAction = #{originAction,jdbcType=VARCHAR}, + originName = #{originName,jdbcType=VARCHAR}, + targetAction = #{targetAction,jdbcType=VARCHAR}, + `type` = #{type,jdbcType=TINYINT}, + `enable` = #{enable,jdbcType=TINYINT}, + `createUser` = #{createUser,jdbcType=VARCHAR}, + updateUser = #{updateUser,jdbcType=VARCHAR}, + createTime = #{createTime,jdbcType=TIMESTAMP}, + updateTime = #{updateTime,jdbcType=TIMESTAMP}, + remark = #{remark,jdbcType=VARCHAR}, + auditStatus = #{auditStatus,jdbcType=TINYINT}, + busAuditStatus = #{busAuditStatus,jdbcType=TINYINT}, + targetBusAction = #{targetBusAction,jdbcType=VARCHAR}, + beforeTime = #{beforeTime,jdbcType=TINYINT}, + busBeforeTime = #{busBeforeTime,jdbcType=TINYINT}, + + + diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml index cf8616f8..76d7512f 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml @@ -61,4 +61,89 @@ + + + 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, + + 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}, + + 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}, + + + diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 1cdd0a55..a57d4dd6 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -58,7 +58,7 @@ insert - ignore + ignore into basic_bussiness_type (mainAction, action, name, enable, remark, thirdSysFk, genUnit, innerOrder, secCheckEnable, checkEnable, checkUdims, checkPdaEd, checkPdaUn, checkPc, checkWebNew, checkSp, checkChange, secCheckUdims, secCheckPdaEd, secCheckPdaUn, @@ -70,7 +70,7 @@ vailGroupBuy, busType, inStock, actionType, thrCheckEnable, thrCheckWebNew, thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp, thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate, - checkExpire, checkCertExpire,preInBackAction, backPreinType) + checkExpire, checkCertExpire, preInBackAction, backPreinType, checkPreInOrders) values (#{mainAction}, #{action}, #{name}, #{enable}, #{remark}, #{thirdSysFk}, #{genUnit}, #{innerOrder}, #{secCheckEnable}, #{checkEnable}, #{checkUdims}, #{checkPdaEd}, #{checkPdaUn}, #{checkPc}, #{checkWebNew}, #{checkSp}, #{checkChange}, #{secCheckUdims}, #{secCheckPdaEd}, #{secCheckPdaUn}, @@ -82,7 +82,7 @@ #{vailGroupBuy}, #{busType}, #{inStock}, #{actionType}, #{thrCheckEnable}, #{thrCheckWebNew}, #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims}, #{thrCheckPc}, #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}, #{checkVailDate}, - #{checkExpire}, #{checkCertExpire},#{preInBackAction},#{backPreinType}) + #{checkExpire}, #{checkCertExpire}, #{preInBackAction}, #{backPreinType}, #{checkPreInOrders}) - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml index 6c99e5eb..1ca244b3 100644 --- a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml +++ b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml @@ -52,6 +52,7 @@ paramStatus=#{paramStatus}, paramType=#{paramType}, paramExplain=#{paramExplain}, + updateTime=#{updateTime}, WHERE id=#{id} @@ -66,16 +67,63 @@ insert INTO sys_param_config(paramName, - paramKey, paramValue, paramStatus, paramType, paramExplain) + paramKey, paramValue, paramStatus, paramType, paramExplain, updateTime) values (#{paramName}, #{paramKey}, #{paramValue}, #{paramStatus}, #{paramType}, - #{paramExplain}) + #{paramExplain}, + #{updateTime} + ) + + + insert into sys_param_config + + + id, + + parentId, + paramName, + paramKey, + paramValue, + paramStatus, + paramType, + paramExplain, + updateTime, + + values + + + #{id,jdbcType=INTEGER}, + + #{parentId,jdbcType=INTEGER}, + #{paramName,jdbcType=VARCHAR}, + #{paramKey,jdbcType=VARCHAR}, + #{paramValue,jdbcType=VARCHAR}, + #{paramStatus,jdbcType=INTEGER}, + #{paramType,jdbcType=INTEGER}, + #{paramExplain,jdbcType=VARCHAR}, + #{updateTime,jdbcType=DATE}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + parentId = #{parentId,jdbcType=INTEGER}, + paramName = #{paramName,jdbcType=VARCHAR}, + paramKey = #{paramKey,jdbcType=VARCHAR}, + paramValue = #{paramValue,jdbcType=VARCHAR}, + paramStatus = #{paramStatus,jdbcType=INTEGER}, + paramType = #{paramType,jdbcType=INTEGER}, + paramExplain = #{paramExplain,jdbcType=VARCHAR}, + updateTime = #{updateTime,jdbcType=DATE}, + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml index d034b81c..4c0912c3 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml @@ -1,78 +1,139 @@ - - - - - - - - - - - - - - - - - - id, templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, - printType, modelKey - + + + + + + + + + + + + + + + + + + id, + templateId, + customerId, + adminId, + moduleId, + localAction, + remark1, + remark2, + remark3, + printType, + modelKey + - + - - insert - ignore + + insert + ignore INTO sys_pdf_template_relevance_biz - (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType,modelKey) + (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType, modelKey, updateTime) values (#{templateId}, - #{customerId}, - #{adminId}, - #{moduleId}, - #{localAction}, - #{remark1}, - #{remark2}, - #{remark3}, - #{printType}, - #{modelKey} -) - - + #{customerId}, + #{adminId}, + #{moduleId}, + #{localAction}, + #{remark1}, + #{remark2}, + #{remark3}, + #{printType}, + #{modelKey}, + #{updateTime}) + + + insert into sys_pdf_template_relevance_biz + + + id, + + templateId, + customerId, + adminId, + moduleId, + localAction, + remark1, + remark2, + remark3, + printType, + modelKey, + updateTime, + + values + + + #{id,jdbcType=INTEGER}, + + #{templateId,jdbcType=INTEGER}, + #{customerId,jdbcType=BIGINT}, + #{adminId,jdbcType=INTEGER}, + #{moduleId,jdbcType=INTEGER}, + #{localAction,jdbcType=VARCHAR}, + #{remark1,jdbcType=VARCHAR}, + #{remark2,jdbcType=VARCHAR}, + #{remark3,jdbcType=VARCHAR}, + #{printType,jdbcType=TINYINT}, + #{modelKey,jdbcType=VARCHAR}, + #{updateTime, jdbcType=DATE}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + templateId = #{templateId,jdbcType=INTEGER}, + customerId = #{customerId,jdbcType=BIGINT}, + adminId = #{adminId,jdbcType=INTEGER}, + moduleId = #{moduleId,jdbcType=INTEGER}, + localAction = #{localAction,jdbcType=VARCHAR}, + remark1 = #{remark1,jdbcType=VARCHAR}, + remark2 = #{remark2,jdbcType=VARCHAR}, + remark3 = #{remark3,jdbcType=VARCHAR}, + printType = #{printType,jdbcType=TINYINT}, + modelKey = #{modelKey,jdbcType=VARCHAR}, + updateTime = #{updateTime,jdbcType=DATE}, + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml index e281a4ec..d12424fe 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml @@ -1,89 +1,151 @@ - - - - - - - - - - - - - - - - - - id, templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, - printType, modelKey - + + + + + + + + + + + + + + + + + + id, + templateId, + customerId, + adminId, + moduleId, + localAction, + remark1, + remark2, + remark3, + printType, + modelKey + - + - - insert - ignore + + insert + ignore INTO sys_pdf_template_relevance_code - (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType,modelKey) + (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType, modelKey) values (#{templateId}, - #{customerId}, - #{adminId}, - #{moduleId}, - #{localAction}, - #{remark1}, - #{remark2}, - #{remark3}, - #{printType}, - #{modelKey} - ) - - - + #{customerId}, + #{adminId}, + #{moduleId}, + #{localAction}, + #{remark1}, + #{remark2}, + #{remark3}, + #{printType}, + #{modelKey}) + + + + insert into sys_pdf_template_relevance_code + + + id, + + templateId, + customerId, + adminId, + moduleId, + localAction, + remark1, + remark2, + remark3, + printType, + modelKey, + updateTime, + + values + + + #{id,jdbcType=INTEGER}, + + #{templateId,jdbcType=INTEGER}, + #{customerId,jdbcType=BIGINT}, + #{adminId,jdbcType=INTEGER}, + #{moduleId,jdbcType=INTEGER}, + #{localAction,jdbcType=VARCHAR}, + #{remark1,jdbcType=VARCHAR}, + #{remark2,jdbcType=VARCHAR}, + #{remark3,jdbcType=VARCHAR}, + #{printType,jdbcType=TINYINT}, + #{modelKey,jdbcType=VARCHAR}, + #{updateTime,jdbcType=DATE}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + templateId = #{templateId,jdbcType=INTEGER}, + customerId = #{customerId,jdbcType=BIGINT}, + adminId = #{adminId,jdbcType=INTEGER}, + moduleId = #{moduleId,jdbcType=INTEGER}, + localAction = #{localAction,jdbcType=VARCHAR}, + remark1 = #{remark1,jdbcType=VARCHAR}, + remark2 = #{remark2,jdbcType=VARCHAR}, + remark3 = #{remark3,jdbcType=VARCHAR}, + printType = #{printType,jdbcType=TINYINT}, + modelKey = #{modelKey,jdbcType=VARCHAR}, + updateTime = #{updateTime,jdbcType=DATE}, + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml index 8bf98fde..d2e3dead 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml @@ -1,56 +1,117 @@ - - - - - - - - - - - - - - - - - - id, templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, - printType, modelKey - + + + + + + + + + + + + + + + + + + id, + templateId, + customerId, + adminId, + moduleId, + localAction, + remark1, + remark2, + remark3, + printType, + modelKey + - + + + insert into sys_pdf_template_relevance_label + + + id, + + templateId, + customerId, + adminId, + moduleId, + localAction, + remark1, + remark2, + remark3, + printType, + modelKey, + updateTime, + + values + + + #{id,jdbcType=INTEGER}, + + #{templateId,jdbcType=INTEGER}, + #{customerId,jdbcType=BIGINT}, + #{adminId,jdbcType=INTEGER}, + #{moduleId,jdbcType=INTEGER}, + #{localAction,jdbcType=VARCHAR}, + #{remark1,jdbcType=VARCHAR}, + #{remark2,jdbcType=VARCHAR}, + #{remark3,jdbcType=VARCHAR}, + #{printType,jdbcType=TINYINT}, + #{modelKey,jdbcType=VARCHAR}, + #{updateTime, jdbcType=DATE}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + templateId = #{templateId,jdbcType=INTEGER}, + customerId = #{customerId,jdbcType=BIGINT}, + adminId = #{adminId,jdbcType=INTEGER}, + moduleId = #{moduleId,jdbcType=INTEGER}, + localAction = #{localAction,jdbcType=VARCHAR}, + remark1 = #{remark1,jdbcType=VARCHAR}, + remark2 = #{remark2,jdbcType=VARCHAR}, + remark3 = #{remark3,jdbcType=VARCHAR}, + printType = #{printType,jdbcType=TINYINT}, + modelKey = #{modelKey,jdbcType=VARCHAR}, + updateTime = #{updateTime,jdbcType=DATE}, + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml index b07bedfe..b09f4686 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml @@ -1,57 +1,115 @@ - - - - - - - - - - - - - - - - - - id, templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, - printType, modelKey - + + + + + + + + + + + + + + + + + + id, + templateId, + customerId, + adminId, + moduleId, + localAction, + remark1, + remark2, + remark3, + printType, + modelKey + - + + + insert into sys_pdf_template_relevance_statemen + + + id, + + templateId, + customerId, + adminId, + moduleId, + localAction, + remark1, + remark2, + remark3, + printType, + modelKey, + + values + + + #{id,jdbcType=INTEGER}, + + #{templateId,jdbcType=INTEGER}, + #{customerId,jdbcType=BIGINT}, + #{adminId,jdbcType=INTEGER}, + #{moduleId,jdbcType=INTEGER}, + #{localAction,jdbcType=VARCHAR}, + #{remark1,jdbcType=VARCHAR}, + #{remark2,jdbcType=VARCHAR}, + #{remark3,jdbcType=VARCHAR}, + #{printType,jdbcType=TINYINT}, + #{modelKey,jdbcType=VARCHAR}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + templateId = #{templateId,jdbcType=INTEGER}, + customerId = #{customerId,jdbcType=BIGINT}, + adminId = #{adminId,jdbcType=INTEGER}, + moduleId = #{moduleId,jdbcType=INTEGER}, + localAction = #{localAction,jdbcType=VARCHAR}, + remark1 = #{remark1,jdbcType=VARCHAR}, + remark2 = #{remark2,jdbcType=VARCHAR}, + remark3 = #{remark3,jdbcType=VARCHAR}, + printType = #{printType,jdbcType=TINYINT}, + modelKey = #{modelKey,jdbcType=VARCHAR}, + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml index 3677595e..58e66ceb 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml @@ -2,24 +2,35 @@ - @@ -46,32 +57,53 @@ - UPDATE sys_pdf_module - name=#{name}, - param=#{param}, - fieldExplain=#{fieldExplain}, - remark=#{remark}, - templateId=#{templateId}, - create_time=#{create_time}, - update_time=#{update_time}, - templateDlUrl=#{templateDlUrl}, - templateType=#{templateType}, - remark1=#{remark1}, - remark2=#{remark2}, - remark3=#{remark3}, - - + + name=#{name}, + + + param=#{param}, + + + fieldExplain=#{fieldExplain}, + + + remark=#{remark}, + + + templateId=#{templateId}, + + + create_time=#{create_time}, + + + update_time=#{update_time}, + + + templateDlUrl=#{templateDlUrl}, + + + templateType=#{templateType}, + + + remark1=#{remark1}, + + + remark2=#{remark2}, + + + remark3=#{remark3}, + - WHERE id=#{id} + WHERE id = #{id} insert INTO sys_pdf_module( name, param, fieldExplain, remark, templateId, create_time, update_time - , templateDlUrl, templateType - , remark1, remark2, remark3) + , templateDlUrl, templateType + , remark1, remark2, remark3) values (#{name}, #{param}, #{fieldExplain}, @@ -92,4 +124,65 @@ from sys_pdf_module where id = #{id} + + + insert into sys_pdf_module + + + id, + + `name`, + param, + fieldExplain, + remark, + templateId, + create_time, + update_time, + templateDlUrl, + templateType, + remark1, + remark2, + remark3, + modelKey, + + values + + + #{id,jdbcType=INTEGER}, + + #{name,jdbcType=VARCHAR}, + #{param,jdbcType=VARCHAR}, + #{fieldExplain,jdbcType=VARCHAR}, + #{remark,jdbcType=VARCHAR}, + #{templateId,jdbcType=INTEGER}, + #{create_time,jdbcType=TIMESTAMP}, + #{update_time,jdbcType=TIMESTAMP}, + #{templateDlUrl,jdbcType=VARCHAR}, + #{templateType,jdbcType=INTEGER}, + #{remark1,jdbcType=VARCHAR}, + #{remark2,jdbcType=VARCHAR}, + #{remark3,jdbcType=VARCHAR}, + #{modelKey,jdbcType=VARCHAR}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + `name` = #{name,jdbcType=VARCHAR}, + param = #{param,jdbcType=VARCHAR}, + fieldExplain = #{fieldExplain,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + templateId = #{templateId,jdbcType=INTEGER}, + create_time = #{create_time,jdbcType=TIMESTAMP}, + update_time = #{update_time,jdbcType=TIMESTAMP}, + templateDlUrl = #{templateDlUrl,jdbcType=VARCHAR}, + templateType = #{templateType,jdbcType=INTEGER}, + remark1 = #{remark1,jdbcType=VARCHAR}, + remark2 = #{remark2,jdbcType=VARCHAR}, + remark3 = #{remark3,jdbcType=VARCHAR}, + modelKey = #{modelKey,jdbcType=VARCHAR}, + + diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml index 1f0e5b69..b1fa79d5 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml @@ -2,16 +2,28 @@ - + + + insert into sys_pdf_template + + + id, + + `name`, + `type`, + `module`, + param, + `path`, + `rowCount`, + qrcodeCount, + remark, + create_time, + update_time, + jrxmlPath, + bussinessType, + bussinessStatus, + + values + + + #{id,jdbcType=INTEGER}, + + #{name,jdbcType=VARCHAR}, + #{type,jdbcType=INTEGER}, + #{module,jdbcType=INTEGER}, + #{param,jdbcType=VARCHAR}, + #{path,jdbcType=VARCHAR}, + #{rowCount,jdbcType=INTEGER}, + #{qrcodeCount,jdbcType=INTEGER}, + #{remark,jdbcType=VARCHAR}, + #{create_time,jdbcType=TIMESTAMP}, + #{update_time,jdbcType=TIMESTAMP}, + #{jrxmlPath,jdbcType=VARCHAR}, + #{bussinessType,jdbcType=VARCHAR}, + #{bussinessStatus,jdbcType=VARCHAR}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + `name` = #{name,jdbcType=VARCHAR}, + `type` = #{type,jdbcType=INTEGER}, + `module` = #{module,jdbcType=INTEGER}, + param = #{param,jdbcType=VARCHAR}, + `path` = #{path,jdbcType=VARCHAR}, + `rowCount` = #{rowCount,jdbcType=INTEGER}, + qrcodeCount = #{qrcodeCount,jdbcType=INTEGER}, + remark = #{remark,jdbcType=VARCHAR}, + create_time = #{create_time,jdbcType=TIMESTAMP}, + update_time = #{update_time,jdbcType=TIMESTAMP}, + jrxmlPath = #{jrxmlPath,jdbcType=VARCHAR}, + bussinessType = #{bussinessType,jdbcType=VARCHAR}, + bussinessStatus = #{bussinessStatus,jdbcType=VARCHAR}, + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml index dd0c5b31..f9538d00 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml @@ -2,22 +2,24 @@ - - select * FROM basic_corp + select * + FROM basic_corp AND thirdId = #{thirdId} @@ -171,4 +190,64 @@ and basic_third_sys.enabled = 1 + + insert into thr_corp + + + id, + + unitId, + spell, + addr, + creditNo, + contact, + mobile, + thirdSysFk, + `name`, + `createUser`, + createTime, + updateUser, + updateTime, + remark, + + values + + + #{id,jdbcType=INTEGER}, + + #{unitId,jdbcType=VARCHAR}, + #{spell,jdbcType=VARCHAR}, + #{addr,jdbcType=VARCHAR}, + #{creditNo,jdbcType=VARCHAR}, + #{contact,jdbcType=VARCHAR}, + #{mobile,jdbcType=VARCHAR}, + #{thirdSysFk,jdbcType=VARCHAR}, + #{name,jdbcType=VARCHAR}, + #{createUser,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateUser,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, + #{remark,jdbcType=VARCHAR}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + unitId = #{unitId,jdbcType=VARCHAR}, + spell = #{spell,jdbcType=VARCHAR}, + addr = #{addr,jdbcType=VARCHAR}, + creditNo = #{creditNo,jdbcType=VARCHAR}, + contact = #{contact,jdbcType=VARCHAR}, + mobile = #{mobile,jdbcType=VARCHAR}, + thirdSysFk = #{thirdSysFk,jdbcType=VARCHAR}, + `name` = #{name,jdbcType=VARCHAR}, + `createUser` = #{createUser,jdbcType=VARCHAR}, + createTime = #{createTime,jdbcType=TIMESTAMP}, + updateUser = #{updateUser,jdbcType=VARCHAR}, + updateTime = #{updateTime,jdbcType=TIMESTAMP}, + remark = #{remark,jdbcType=VARCHAR}, + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml index 1c5f7e7c..312a344e 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml @@ -210,32 +210,58 @@ - - - select id - from thr_dept - where id = #{id} - - - update thr_dept - set pId = #{pid}, - name = #{name}, - code = #{code}, - advanceType = #{advanceType}, - isDefault = #{isDefault}, - status = #{status}, - updateTime = #{updateTime}, - remark = #{remark}, - level = #{level}, - pcode = #{pcode}, - thirdSysFk = #{thirdSysFk} - where id = #{id}; - - - insert into thr_dept(id, pId, code, name, advanceType, isDefault, status, updateTime, remark, level, pcode, - thirdSysFk) - values (#{id}, #{pid}, #{code}, #{name}, #{advanceType}, #{isDefault}, #{status}, #{updateTime}, #{remark}, - #{level}, #{pcode}, #{thirdSysFk}) - - + + insert into thr_dept + + + id, + + pId, + code, + `name`, + advanceType, + isDefault, + `status`, + updateTime, + remark, + `level`, + pcode, + thirdSysFk, + + values + + + #{id,jdbcType=INTEGER}, + + #{pId,jdbcType=INTEGER}, + #{code,jdbcType=VARCHAR}, + #{name,jdbcType=VARCHAR}, + #{advanceType,jdbcType=VARCHAR}, + #{isDefault,jdbcType=TINYINT}, + #{status,jdbcType=TINYINT}, + #{updateTime,jdbcType=TIMESTAMP}, + #{remark,jdbcType=VARCHAR}, + #{level,jdbcType=TINYINT}, + #{pcode,jdbcType=VARCHAR}, + #{thirdSysFk,jdbcType=VARCHAR}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + pId = #{pId,jdbcType=INTEGER}, + code = #{code,jdbcType=VARCHAR}, + `name` = #{name,jdbcType=VARCHAR}, + advanceType = #{advanceType,jdbcType=VARCHAR}, + isDefault = #{isDefault,jdbcType=TINYINT}, + `status` = #{status,jdbcType=TINYINT}, + updateTime = #{updateTime,jdbcType=TIMESTAMP}, + remark = #{remark,jdbcType=VARCHAR}, + `level` = #{level,jdbcType=TINYINT}, + pcode = #{pcode,jdbcType=VARCHAR}, + thirdSysFk = #{thirdSysFk,jdbcType=VARCHAR}, + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml index 37e2e9f9..c1e02af5 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml @@ -122,12 +122,20 @@ WHERE id = #{id} - - - select id - from thr_dept - where id = #{id} - - + + insert into thr_inv_warehouse + (id, code, `name`, parentId, remark, thirdSysFk,updateTime) + values + (#{id,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, + #{remark,jdbcType=VARCHAR}, #{thirdSysFk,jdbcType=VARCHAR}, #{updateTime}) + on duplicate key update + id = #{id,jdbcType=VARCHAR}, + code = #{code,jdbcType=VARCHAR}, + `name` = #{name,jdbcType=VARCHAR}, + parentId = #{parentId,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + thirdSysFk = #{thirdSysFk,jdbcType=VARCHAR}, + updateTime = #{updateTime,jdbcType=DATE} + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index bcd5bf54..2734c22e 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -1,36 +1,37 @@ - - @@ -93,33 +101,36 @@ @@ -153,60 +166,60 @@ replace - INTO thr_products - (code, `name`, measname, spec, registerNo, manufactory, - cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, - thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3,price,createUser,createTime,updateUser) - values ( - #{code}, - #{name}, - #{measname}, - #{spec}, - #{registerNo}, - #{manufactory}, - #{cplb}, - #{flbm}, - #{qxlb}, - #{ybbm}, - #{sptm}, - #{tyshxydm}, - #{zczbhhzbapzbh}, - #{ylqxzcrbarmc}, - #{ylqxzcrbarywmc}, - #{cpms}, - #{thirdSysFk}, - #{updateTime}, - #{supName}, - #{model}, - #{standard}, - #{qtbm}, - #{zczyxqz}, - #{remark}, - #{remark1}, - #{remark2}, - #{remark3}, - #{price}, - #{createUser}, - #{createTime}, - #{updateUser} - ) + INTO thr_products + (code, `name`, measname, spec, registerNo, manufactory, + cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, + thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3, price, + createUser, createTime, updateUser) + values (#{code}, + #{name}, + #{measname}, + #{spec}, + #{registerNo}, + #{manufactory}, + #{cplb}, + #{flbm}, + #{qxlb}, + #{ybbm}, + #{sptm}, + #{tyshxydm}, + #{zczbhhzbapzbh}, + #{ylqxzcrbarmc}, + #{ylqxzcrbarywmc}, + #{cpms}, + #{thirdSysFk}, + #{updateTime}, + #{supName}, + #{model}, + #{standard}, + #{qtbm}, + #{zczyxqz}, + #{remark}, + #{remark1}, + #{remark2}, + #{remark3}, + #{price}, + #{createUser}, + #{createTime}, + #{updateUser}) + + + insert into thr_products + + + id, + + code, + `name`, + measname, + spec, + registerNo, + manufactory, + thirdSysFk, + cplb, + flbm, + qxlb, + ybbm, + sptm, + tyshxydm, + zczbhhzbapzbh, + ylqxzcrbarmc, + ylqxzcrbarywmc, + cpms, + updateTime, + supName, + model, + `standard`, + qtbm, + zczyxqz, + remark, + remark1, + remark2, + remark3, + price, + `createUser`, + createTime, + updateUser, + + values + + + #{id,jdbcType=INTEGER}, + + #{code,jdbcType=VARCHAR}, + #{name,jdbcType=VARCHAR}, + #{measname,jdbcType=VARCHAR}, + #{spec,jdbcType=VARCHAR}, + #{registerNo,jdbcType=VARCHAR}, + #{manufactory,jdbcType=VARCHAR}, + #{thirdSysFk,jdbcType=VARCHAR}, + #{cplb,jdbcType=VARCHAR}, + #{flbm,jdbcType=VARCHAR}, + #{qxlb,jdbcType=VARCHAR}, + #{ybbm,jdbcType=VARCHAR}, + #{sptm,jdbcType=VARCHAR}, + #{tyshxydm,jdbcType=VARCHAR}, + #{zczbhhzbapzbh,jdbcType=VARCHAR}, + #{ylqxzcrbarmc,jdbcType=VARCHAR}, + #{ylqxzcrbarywmc,jdbcType=VARCHAR}, + #{cpms,jdbcType=LONGVARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, + #{supName,jdbcType=VARCHAR}, + #{model,jdbcType=VARCHAR}, + #{standard,jdbcType=VARCHAR}, + #{qtbm,jdbcType=VARCHAR}, + #{zczyxqz,jdbcType=VARCHAR}, + #{remark,jdbcType=VARCHAR}, + #{remark1,jdbcType=VARCHAR}, + #{remark2,jdbcType=VARCHAR}, + #{remark3,jdbcType=VARCHAR}, + #{price,jdbcType=VARCHAR}, + #{createUser,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateUser,jdbcType=VARCHAR}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + code = #{code,jdbcType=VARCHAR}, + `name` = #{name,jdbcType=VARCHAR}, + measname = #{measname,jdbcType=VARCHAR}, + spec = #{spec,jdbcType=VARCHAR}, + registerNo = #{registerNo,jdbcType=VARCHAR}, + manufactory = #{manufactory,jdbcType=VARCHAR}, + thirdSysFk = #{thirdSysFk,jdbcType=VARCHAR}, + cplb = #{cplb,jdbcType=VARCHAR}, + flbm = #{flbm,jdbcType=VARCHAR}, + qxlb = #{qxlb,jdbcType=VARCHAR}, + ybbm = #{ybbm,jdbcType=VARCHAR}, + sptm = #{sptm,jdbcType=VARCHAR}, + tyshxydm = #{tyshxydm,jdbcType=VARCHAR}, + zczbhhzbapzbh = #{zczbhhzbapzbh,jdbcType=VARCHAR}, + ylqxzcrbarmc = #{ylqxzcrbarmc,jdbcType=VARCHAR}, + ylqxzcrbarywmc = #{ylqxzcrbarywmc,jdbcType=VARCHAR}, + cpms = #{cpms,jdbcType=LONGVARCHAR}, + updateTime = #{updateTime,jdbcType=TIMESTAMP}, + supName = #{supName,jdbcType=VARCHAR}, + model = #{model,jdbcType=VARCHAR}, + `standard` = #{standard,jdbcType=VARCHAR}, + qtbm = #{qtbm,jdbcType=VARCHAR}, + zczyxqz = #{zczyxqz,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + remark1 = #{remark1,jdbcType=VARCHAR}, + remark2 = #{remark2,jdbcType=VARCHAR}, + remark3 = #{remark3,jdbcType=VARCHAR}, + price = #{price,jdbcType=VARCHAR}, + `createUser` = #{createUser,jdbcType=VARCHAR}, + createTime = #{createTime,jdbcType=TIMESTAMP}, + updateUser = #{updateUser,jdbcType=VARCHAR}, + + diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 0b8a7ac8..62fd6712 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -170,6 +170,13 @@ CALL Pro_Temp_ColumnWork('sync_data_set', 'systemConfig', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'printConfig', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'scanChangeConfig', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'busChangeConfig', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'basicThirdDept', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_param_config', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_code', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_biz', 'updateTime', 'datetime', 1); +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('basic_bussiness_type', 'advancePreIn', 'tinyint', 1);