From edbaea7363380f7d611dfeab501bce48fe200d1d Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Sat, 11 Jun 2022 18:09:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A7=94=E6=89=98=E9=AA=8C?= =?UTF-8?q?=E6=94=B6=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/admin/dao/basic/EntrustReceDao.java | 2 ++ .../api/admin/res/basic/SpsSyncBusResponse.java | 2 +- .../api/admin/res/info/SyncDataSetResponse.java | 6 ++++++ .../admin/service/basic/EntrustReceService.java | 2 ++ .../basic/impl/EntrustReceServiceImpl.java | 5 +++++ .../glxp/api/admin/thread/DlBasicService.java | 14 +++++++++++++- .../com/glxp/api/admin/thread/HeartService.java | 2 ++ .../glxp/api/admin/thread/UpBasicService.java | 14 ++++++++++++++ .../mybatis/mapper/basic/EntrustReceDao.xml | 17 +++++++++++++++-- 9 files changed, 60 insertions(+), 4 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/EntrustReceDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/EntrustReceDao.java index 08a95284..c77b4bee 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/EntrustReceDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/EntrustReceDao.java @@ -23,6 +23,8 @@ public interface EntrustReceDao { boolean deleteById(String id); + boolean deleteAll(); + boolean updateEntrustRec(EntrustReceEntity warehouseEntity); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncBusResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncBusResponse.java index 7523e245..f14146e4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncBusResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncBusResponse.java @@ -13,6 +13,6 @@ public class SpsSyncBusResponse { private List bussinessTypeEntities; private List bussinessOriginTypeEntities; private List bussinessLocalTypeEntities; - private List bussinessChangeTypeEntities; + private List entrustReceEntities; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java index 6542fe5a..550d57ad 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java @@ -28,4 +28,10 @@ public class SyncDataSetResponse { private Integer syncDownloadTime; //定时下载时间 private boolean sysUser; + + private Integer orderSyncTime; + private String orderSyncStart; + private String basicSyncStart; + private boolean entrustAction; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/EntrustReceService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/EntrustReceService.java index 4afb86f9..bf166b6c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/EntrustReceService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/EntrustReceService.java @@ -22,6 +22,8 @@ public interface EntrustReceService { boolean deleteById(String id); + boolean deleteAll(); + boolean updateEntrustRec(EntrustReceEntity warehouseEntity); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/EntrustReceServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/EntrustReceServiceImpl.java index 005a1cee..e5321ab6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/EntrustReceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/EntrustReceServiceImpl.java @@ -79,6 +79,11 @@ public class EntrustReceServiceImpl implements EntrustReceService { return entrustReceDao.deleteById(id); } + @Override + public boolean deleteAll() { + return entrustReceDao.deleteAll(); + } + @Override public boolean updateEntrustRec(EntrustReceEntity entrustReceEntity) { return entrustReceDao.updateEntrustRec(entrustReceEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java index 9843ea29..c261848a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java @@ -31,6 +31,7 @@ import com.glxp.api.admin.res.basic.SpsSyncDataResponse; import com.glxp.api.admin.res.basic.SpsSyncOrderResponse; import com.glxp.api.admin.service.basic.BasicDownloadService; import com.glxp.api.admin.service.basic.BussinessChangeTypeService; +import com.glxp.api.admin.service.basic.EntrustReceService; import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.admin.service.inventory.InvWarehouseService; import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService; @@ -71,7 +72,8 @@ public class DlBasicService { WarehouseUserDao warehouseUserDao; @Resource WarehouseBussinessTypeDao warehouseBussinessTypeDao; - + @Resource + EntrustReceService entrustReceService; @Resource ThrInvWarehouseService thrInvWarehouseService; @Resource @@ -373,6 +375,16 @@ public class DlBasicService { logger.error(e.getMessage()); } } + + + if (CollUtil.isNotEmpty(syncDataResponse.getEntrustReceEntities())) { + entrustReceService.deleteAll(); + for (EntrustReceEntity entrustReceEntity : syncDataResponse.getEntrustReceEntities()) { + entrustReceEntity.setUpdateTime(null); + entrustReceService.insertEntrustRec(entrustReceEntity); + } + } + batchSession.close(); spGetHttp.postBasicStatus(basicExportStatusEntity.getId()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java index 707d4887..8d0a2d54 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java @@ -139,6 +139,8 @@ public class HeartService { logs = logs + "业务单据类型：" + spsSyncBusResponse.getBussinessLocalTypeEntities().size() + "条\n"; if (CollUtil.isNotEmpty(spsSyncBusResponse.getBussinessOriginTypeEntities())) logs = logs + "第三方单据类型：" + spsSyncBusResponse.getBussinessOriginTypeEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(spsSyncBusResponse.getEntrustReceEntities())) + logs = logs + "委托验收设置：" + spsSyncBusResponse.getEntrustReceEntities().size() + "条\n"; basicExportStatusEntity2.setRemark(logs); basicExportStatusEntity2.setUpdateTime(new Date()); basicExportService.updateExportStatus(basicExportStatusEntity2); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java index 2d48f21b..4c031742 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java @@ -212,6 +212,8 @@ public class UpBasicService { BussinessOriginTypeService bussinessOriginTypeService; @Resource private BussinessChangeTypeService bussinessChangeTypeService; + @Resource + private EntrustReceService entrustReceService; public SpsSyncBusResponse upAllBus(SpsSyncDataRequest spsSyncDataRequest) { SpsSyncBusResponse spsSyncBusResponse = new SpsSyncBusResponse(); @@ -258,6 +260,18 @@ public class UpBasicService { List bussinessOriginTypeEntities = bussinessOriginTypeService.filterList(bussinessOriginTypeFilterRequest); spsSyncBusResponse.setBussinessOriginTypeEntities(bussinessOriginTypeEntities); } + + //委托验收 + if (syncDataSetEntity.isEntrustAction()) { + BasicEntrustRecRequest basicEntrustRecRequest = new BasicEntrustRecRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, basicEntrustRecRequest); + List dlEntrustReceEntities = entrustReceService.filterEntrustRec(basicEntrustRecRequest); + if (CollUtil.isNotEmpty(dlEntrustReceEntities)) { + List temps = entrustReceService.filterEntrustRec(new BasicEntrustRecRequest()); + spsSyncBusResponse.setEntrustReceEntities(temps); + } + } + return spsSyncBusResponse; } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml index 0e4f9a42..5b683b1d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml @@ -25,6 +25,10 @@ and curInv = #{curInv} + + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + order by updateTime desc @@ -54,6 +58,9 @@ and basic_entrust_accept.userId = #{userId} + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + @@ -96,9 +103,8 @@ replace - INTO basic_entrust_accept(id,`action`, entrustInv, `entrustUser`, userId, updateTime, remark,entrustAction,finishRece,curInv) + INTO basic_entrust_accept(`action`, entrustInv, `entrustUser`, userId, updateTime, remark,entrustAction,finishRece,curInv) values ( - #{id}, #{action}, #{entrustInv}, #{entrustUser}, @@ -132,4 +138,11 @@ WHERE id = #{id} + + + DELETE + FROM basic_entrust_accept + + + \ No newline at end of file