From a8ad9715670b87e3e6c7fa4d9510e539cbea81ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 10 Aug 2023 09:51:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E4=BF=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DeviceRepairOrderServiceImpl.java | 27 +++++++++++-------- .../mapper/inv/DeviceInspectTaskMapper.xml | 5 ++++ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java index 4261ad0d1..9bc6ccb9f 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java @@ -7,9 +7,12 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; +import com.glxp.api.constant.DeviceStatus; +import com.glxp.api.constant.DeviceType; import com.glxp.api.dao.inv.DeviceInspectPlanDao; import com.glxp.api.dao.inv.DeviceInspectPlanDelectMapper; import com.glxp.api.dao.inv.DeviceRepairOrderDao; +import com.glxp.api.dao.inv.DeviceRepairOrderDetailMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.inv.*; import com.glxp.api.req.inv.AddDeviceRepairOrderRequest; @@ -52,7 +55,7 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { @Resource private DeviceInspectTaskDetailService deviceInspectTaskDetailService; @Resource - private DeviceInspectPlanDao deviceInspectPlanDao; + private DeviceRepairOrderDetailMapper deviceRepairOrderDetailMapper; @Override @@ -182,7 +185,10 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { deviceInspectTaskEntity.setDeptCode(deviceRepairOrderEntity.getDeptCode()); deviceInspectTaskEntity.setInvCode(deviceRepairOrderEntity.getInvCode()); deviceInspectTaskEntity.setCode(deviceRepairOrderEntity.getCode()); - deviceInspectTaskEntity.setStatus(0); + deviceInspectTaskEntity.setStatus(DeviceStatus.DEVICE_STATUS_TEMP_SAVE); + deviceInspectTaskEntity.setType(DeviceType.TYPE_REPAIR); + deviceInspectTaskEntity.setLevel(deviceRepairOrderEntity.getUrgencyType()); + deviceInspectTaskEntity.setRepairType(deviceRepairOrderEntity.getRepairType()); deviceInspectTaskEntity.setRemark(deviceRepairOrderEntity.getRemark()); deviceInspectTaskEntity.setCreateTime(new Date()); deviceInspectTaskEntity.setUpdateTime(new Date()); @@ -192,21 +198,20 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { //组装任务实体 public List getDeviceInspectTaskDetailEntity(String orderId, String taskOrderIdFk) { - //查询计划详情单 - DeviceInspectPlanEntity deviceInspectPlanEntity = deviceInspectPlanDao.selectByOrderId(orderId); + //查询报修详情单 + DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId); List deviceInspectTaskDetailEntityLis = new ArrayList<>(); - QueryWrapper ew = new QueryWrapper<>(); + QueryWrapper ew = new QueryWrapper<>(); ew.eq("orderIdFK", orderId); - List deviceInspectPlanDelectEntityList = deviceInspectPlanDelectMapper.selectList(ew); - if (deviceInspectPlanDelectEntityList == null && deviceInspectPlanDelectEntityList.size() == 0) { + List deviceRepairOrderDetailEntities = deviceRepairOrderDetailMapper.selectList(ew); + if (deviceRepairOrderDetailEntities == null && deviceRepairOrderDetailEntities.size() == 0) { return null; } - for (DeviceInspectPlanDelectEntity deviceInspectPlanDelectEntity : deviceInspectPlanDelectEntityList) { + for (DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity : deviceRepairOrderDetailEntities) { DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity = new DeviceInspectTaskDetailEntity(); - deviceInspectTaskDetailEntity.setProjectCode(deviceInspectPlanEntity.getCode()); - deviceInspectTaskDetailEntity.setProjectContent(deviceInspectPlanDelectEntity.getContent()); + deviceInspectTaskDetailEntity.setProjectCode(deviceRepairOrderDetailEntity.getCode()); + deviceInspectTaskDetailEntity.setProjectContent(deviceRepairOrderDetailEntity.getContent()); deviceInspectTaskDetailEntity.setStatus(1); - deviceInspectTaskDetailEntity.setInspectUser(deviceInspectPlanEntity.getInspectUser()); deviceInspectTaskDetailEntity.setUpdateTime(new Date()); deviceInspectTaskDetailEntity.setTaskOrderIdFk(taskOrderIdFk); deviceInspectTaskDetailEntityLis.add(deviceInspectTaskDetailEntity); diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml b/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml index 0caccb29c..78e2a0b5a 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml @@ -44,6 +44,8 @@ t.remark, t.remindTime, t.expectedTime, + t.repairType, + t.level, (select `name` from auth_dept where code = t.deptCode) deptName, (select `name` from auth_warehouse where code = t.invCode) invName, ( SELECT `employeeName` FROM auth_user WHERE id = t.inspectUser ) inspectName, @@ -69,6 +71,9 @@ AND t.level = #{level} + + AND t.repairType = #{repairType} + AND t.status = #{status} From 8cf48f17d2288edccb92222c04f801e6e0886369 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 10 Aug 2023 10:03:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=AA=E6=A0=A1=E9=AA=8C=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/constant/ThirdSysConstant.java | 20 +++++++----- .../api/dao/inout/IoOrderDetailBizDao.java | 2 +- .../service/inout/IoCheckInoutService.java | 3 +- .../service/thrsys/ThrProductsService.java | 11 +++++-- .../thrsys/impl/ThrProductsServiceImpl.java | 19 ++++++++++++ .../com/glxp/api/task/SyncThirdSysTask.java | 31 +++++++++++++++++-- src/main/resources/schemas/schema_v2.2.sql | 1 + 7 files changed, 73 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/ThirdSysConstant.java b/src/main/java/com/glxp/api/constant/ThirdSysConstant.java index 1d5fdb608..e13d60168 100644 --- a/src/main/java/com/glxp/api/constant/ThirdSysConstant.java +++ b/src/main/java/com/glxp/api/constant/ThirdSysConstant.java @@ -8,36 +8,42 @@ public interface ThirdSysConstant { /** * 仓库货位码查询 */ - public static final String WAREHOUSE_QUERY_URL = "warehouseQueryUrl"; + String WAREHOUSE_QUERY_URL = "warehouseQueryUrl"; /** * 业务单据提交 */ - public static final String ORDER_SUBMIT_URL = "orderSubmitUrl"; + String ORDER_SUBMIT_URL = "orderSubmitUrl"; /** * 业务单据查询 */ - public static final String ORDER_QUERY_URL = "orderQueryUrl"; + String ORDER_QUERY_URL = "orderQueryUrl"; /** * 单据类型查询 */ - public static final String BUS_TYPE_QUERY_URL = "busTypeQueryUrl"; + String BUS_TYPE_QUERY_URL = "busTypeQueryUrl"; /** * 仓库/科室查询 */ - public static final String invPiUrl = "invPiUrl"; + String invPiUrl = "invPiUrl"; /** * 往来单位查询 */ - public static final String CORP_URL = "corpUrl"; + String CORP_URL = "corpUrl"; /** * 产品信息查询 */ - public static final String PI_QUERY_URL = "piQueryUrl"; + String PI_QUERY_URL = "piQueryUrl"; + + /** + * 产品信息提交 + */ + String PI_SUBMIT_URL = "productSubmitUrl"; + } diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java index 1e56cf232..8b89b4f18 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java @@ -34,7 +34,7 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus { /** * 导入第三方产品信息 * - * @param files * @param thirdSys * @return */ @@ -74,7 +74,14 @@ public interface ThrProductsService extends IService { * @param filterThrProductsRequest * @return */ - BaseResponse downloadByRequest(FilterThrProductsRequest filterThrProductsRequest); + BaseResponse downloadByRequest(FilterThrProductsRequest filterThrProductsRequest); ThrProductsEntity filterThrProductsByMainId(String relId); + + /** + * 上传本地变更产品信息 + * + * @return + */ + BaseResponse uploadThrProduct(ThrSystemDetailEntity thrSystemDetailEntity); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index 9fc482659..967ea650c 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -17,8 +17,10 @@ import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.req.thrsys.PostThrProductsRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; import com.glxp.api.service.thrsys.ThrProductsService; +import com.glxp.api.util.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; @@ -281,6 +283,23 @@ public class ThrProductsServiceImpl extends ServiceImpl { + log.info("开始下载第三方业务单据"); + try { + thrProductsService.uploadThrProduct(thrSystemDetailEntity); + } catch (Exception e) { + log.error("下载第三方业务单据", e); + } finally { + updateTask(getTaskKey(thrSystemDetailEntity)); + } + log.info("第三方业务单据下载完成"); + }); + } + } + /** * 更新任务状态为已完成 * @@ -289,7 +314,7 @@ public class SyncThirdSysTask implements SchedulingConfigurer { */ private boolean verifyTask(ThrSystemDetailEntity thrSystemDetailEntity) { String taskKey = getTaskKey(thrSystemDetailEntity); - ThirdSysInterfaceExecuteVo vo = getLastResult(taskKey); + ThirdSysInterfaceExecuteVo vo = getLastResult(taskKey); if (null != vo && !vo.isFinished()) { log.info(vo.getKey() + "有任务尚未执行完成，当前任务key：{}", taskKey); return false; @@ -298,12 +323,12 @@ public class SyncThirdSysTask implements SchedulingConfigurer { if (vo != null) { long lastTime = vo.getNextTime(); - long timeInterval = Long.parseLong(thrSystemDetailEntity.getTime().intValue() + "") * 1000 * 60; + long timeInterval = Long.parseLong(thrSystemDetailEntity.getTime().intValue() + "") * 1000 * 60; if (curTime - lastTime < timeInterval) { log.info("定时任务时间未到---" + taskKey); return false; } else { - return true; + return true; } } else { vo = Optional.ofNullable(vo).orElse(new ThirdSysInterfaceExecuteVo()); diff --git a/src/main/resources/schemas/schema_v2.2.sql b/src/main/resources/schemas/schema_v2.2.sql index 4ffc83b51..4cb5d8668 100644 --- a/src/main/resources/schemas/schema_v2.2.sql +++ b/src/main/resources/schemas/schema_v2.2.sql @@ -85,3 +85,4 @@ CALL Pro_Temp_ColumnWork('device_inspect_plan', 'planStatus', 'tinyint', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'inspectUser', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'lastTime', 'datetime', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'nextTime', 'datetime', 1); +INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (2088, 0, '是否只校验批次号', 'only_vail_batch', '0', 0, 0, '是否只校验批次号(0：否；1：是)', NULL); From b5c1f907eba587a0c4225e52d6286dc5986201d1 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 10 Aug 2023 11:14:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B7=A1=E6=A3=80=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java | 3 ++- .../resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java index 240f2a381..4e0e3c3ba 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java @@ -1,6 +1,5 @@ package com.glxp.api.req.inv; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @@ -64,6 +63,8 @@ public class FilterDeviceInspectTakeRequest extends ListPageRequest { private Integer repairType; + private Integer type; + diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml b/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml index 78e2a0b5a..0d40e5067 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml @@ -71,6 +71,9 @@ AND t.level = #{level} + + AND t.type = #{type} + AND t.repairType = #{repairType} From 6cac80437bd9f28f1ebb7d89fde11840fa6eb1ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com> Date: Thu, 10 Aug 2023 17:35:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E2=80=98DI/=E7=89=A9=E8=B5=84=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E2=80=99=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E6=9C=89?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/purchase/PurApplyDetailDao.xml | 1 + .../resources/mybatis/mapper/purchase/PurOrderDetailDao.xml | 1 + .../resources/mybatis/mapper/purchase/PurPlanDetailDao.xml | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml index f40d69dae..f0ec81f00 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml @@ -121,6 +121,7 @@ SELECT pur_apply_detail.*, pur_apply.billNo, basic_products.ggxh spec, + basic_products.nameCode, basic_products.measname, basic_products.manufactory, basic_products.ylqxzcrbarmc, diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml index fc9c249b9..d9a614695 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml @@ -139,6 +139,7 @@ - \ No newline at end of file +