From 340a02bfc7822193183f9fcd0635f46b89a9eb54 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 15 Dec 2022 14:19:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5=E6=B7=BB=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/AuthAdminController.java | 25 +++++++++++++++++-- .../com/glxp/api/admin/dao/auth/DeptDao.java | 1 + .../admin/req/auth/AuthAdminQueryRequest.java | 5 ++++ .../api/admin/service/auth/DeptService.java | 1 + .../service/auth/impl/DeptServiceImpl.java | 5 ++++ .../mybatis/mapper/auth/AuthAdminDao.xml | 3 +++ .../resources/mybatis/mapper/auth/DeptDao.xml | 3 +++ 7 files changed, 41 insertions(+), 2 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java index d7a6bd2a..d490537d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java @@ -1,10 +1,12 @@ package com.glxp.api.admin.controller.auth; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.auth.AuthRole; import com.glxp.api.admin.entity.auth.AuthRoleAdmin; +import com.glxp.api.admin.entity.auth.DeptEntity; import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; import com.glxp.api.admin.req.auth.AuthAdminSaveRequest; @@ -14,6 +16,7 @@ import com.glxp.api.admin.res.auth.AuthAdminRoleResponse; import com.glxp.api.admin.service.auth.AuthAdminService; import com.glxp.api.admin.service.auth.AuthRoleAdminService; import com.glxp.api.admin.service.auth.AuthRoleService; +import com.glxp.api.admin.service.auth.DeptService; import com.glxp.api.admin.service.inventory.InvSubWarehouseService; import com.glxp.api.admin.util.GennerOrderUtils; import com.glxp.api.admin.util.PasswordUtils; @@ -47,6 +50,8 @@ public class AuthAdminController { GennerOrderUtils gennerOrderUtils; @Resource private InvSubWarehouseService invSubWarehouseService; + @Resource + private DeptService deptService; /** * 获取管理员列表 @@ -144,7 +149,16 @@ public class AuthAdminController { if (authAdmin.getPassWord() != null) { authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); } + + //设置部门信息 + if (StrUtil.isNotBlank(authAdminSaveRequest.getDept())) { + authAdmin.setDept(authAdminSaveRequest.getDept()); + DeptEntity deptEntity = deptService.findByDeptCode(authAdminSaveRequest.getDept()); + authAdmin.setDeptName(deptEntity.getName()); + } + authAdmin.setLastModifyTime(new Date()); + authAdmin.setId(gennerOrderUtils.getRelId()); boolean b = authAdminService.insertAuthAdmin(authAdmin); authAdmin = authAdminService.findByUserName(authAdmin.getUserName()); @@ -192,6 +206,13 @@ public class AuthAdminController { authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); } authAdmin.setLastModifyTime(new Date()); + + if (StrUtil.isNotBlank(authAdminSaveRequest.getDept())) { + authAdmin.setDept(authAdmin.getDept()); + DeptEntity deptEntity = deptService.findByDeptCode(authAdmin.getDept()); + authAdmin.setDeptName(deptEntity.getName()); + } + boolean b = authAdminService.updateAuthAdmin(authAdmin); if (!b) { @@ -220,8 +241,8 @@ public class AuthAdminController { if (authAdminSaveRequest.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！"); } - InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(authAdminSaveRequest.getLocSubInvCode()); - if(invSubWarehouseEntity!=null){ + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(authAdminSaveRequest.getLocSubInvCode()); + if (invSubWarehouseEntity != null) { authAdminSaveRequest.setLocInvCode(invSubWarehouseEntity.getParentId()); } AuthAdmin authAdmin = new AuthAdmin(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java index b6c34a88..578de075 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java @@ -21,4 +21,5 @@ public interface DeptDao { boolean deleteAll(); + DeptEntity selectByCode(String code); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java index 9df0874b..df01f03d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java @@ -23,4 +23,9 @@ public class AuthAdminQueryRequest extends ListPageRequest { //用户名 != private String neUserName; + /** + * 部门编码 + */ + private String deptCode; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java index 049dbcd7..96b4dedf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java @@ -20,4 +20,5 @@ public interface DeptService { boolean deleteAll(); + DeptEntity findByDeptCode(String dept); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java index d21690a9..4985a150 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java @@ -43,4 +43,9 @@ public class DeptServiceImpl implements DeptService { public boolean deleteAll() { return deptDao.deleteAll(); } + + @Override + public DeptEntity findByDeptCode(String deptCode) { + return deptDao.selectByCode(deptCode); + } } diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index c4ae5e9f..da0ec76c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -26,6 +26,9 @@ = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + + AND dept = #{deptCode} + ORDER BY id DESC diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml index 01554923..9c8905a5 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml @@ -50,4 +50,7 @@ from auth_dept + \ No newline at end of file From b822dcad01c013007449501e701dcefa607ff045 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 15 Dec 2022 17:27:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/InvSubWarehouseController.java | 33 +++++++++++++------ .../dao/inventory/InvSubWarehouseDao.java | 6 ++++ .../inventory/FilterInvProductRequest.java | 5 +++ .../inventory/InvSubWarehouseService.java | 8 +++++ .../impl/InvSubWarehouseServiceImpl.java | 5 +++ .../mapper/inventory/InvProductDao.xml | 2 ++ .../mapper/inventory/InvSubWarehouseDao.xml | 23 +++++++++++++ .../main/resources/schemas/schema_v2.1.sql | 4 +-- 8 files changed, 74 insertions(+), 12 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java index 47876444..95e695c1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java @@ -79,21 +79,21 @@ public class InvSubWarehouseController { AuthAdmin authAdmin = customerService.getUserBean(); if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) { if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1) { - if (authAdmin.getCustomerId()==110) { + if (authAdmin.getCustomerId() == 110) { filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); - }else { + } else { filterInvWarehouseRequest.setSpUse(true); } } - } else{ - if(filterInvWarehouseRequest.getFilter()==3 && filterInvWarehouseRequest.getFilter()!=null){ + } else { + if (filterInvWarehouseRequest.getFilter() == 3 && filterInvWarehouseRequest.getFilter() != null) { - if (authAdmin.getCustomerId()==110) + if (authAdmin.getCustomerId() == 110) filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); else { filterInvWarehouseRequest.setSpUse(true); } - }else{ + } else { //走这边表示单据选择的是往来单位里面调出调入的库 //判断单据类型是1就是设置单据需要需要查询除自己以外的分库 SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); @@ -102,13 +102,13 @@ public class InvSubWarehouseController { // 查询总库信息 InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); //查询仓库信息 - if(invSubWarehouseEntity!=null){ + if (invSubWarehouseEntity != null) { InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId()); filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode()); filterInvWarehouseRequest.setSuperiorPcode(invWarehouseEntity.getPcode()); filterInvWarehouseRequest.setCode(null); - }else { - return ResultVOUtils.error(999,"分库编号为空！"); + } else { + return ResultVOUtils.error(999, "分库编号为空！"); } @@ -134,7 +134,7 @@ public class InvSubWarehouseController { // return ResultVOUtils.error(500, "用户或仓库不能未空！"); // } AuthAdmin authAdmin = customerService.getUserBean(); - InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); filterInvWarehouseRequest.setSubordinateCode(invSubWarehouseEntity.getParentId()); filterInvWarehouseRequest.setCode(null); List invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSubDown(filterInvWarehouseRequest); @@ -289,4 +289,17 @@ public class InvSubWarehouseController { return ResultVOUtils.success(); } + /** + * 查询分仓列表 + * + * @param filterInvWarehouseRequest + * @return + */ + @AuthRuleAnnotation("") + @GetMapping("/spms/sub/inv/warehouse/filterSubInvList") + public BaseResponse filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest) { + List responses = invSubWarehouseService.filterSubInvList(filterInvWarehouseRequest); + return ResultVOUtils.success(responses); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java index 1bd62061..43b6cc72 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java @@ -64,5 +64,11 @@ public interface InvSubWarehouseDao { List filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest); + /** + * 查询分仓列表 + * @param filterInvWarehouseRequest + * @return + */ + List filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductRequest.java index d4d17780..6da60fc4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductRequest.java @@ -44,4 +44,9 @@ public class FilterInvProductRequest extends ListPageRequest { private String supName; private String orderIdFk; + + /** + * 产品类别 + */ + private String cplb; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java index 57170108..ca3c657a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java @@ -60,4 +60,12 @@ public interface InvSubWarehouseService { /** 查询仓库下级*/ List filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest); + /** + * 查询分仓列表 + * + * @param filterInvWarehouseRequest + * @return + */ + List filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java index 781aaf06..a4fb5f8c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java @@ -202,4 +202,9 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService { public List filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest) { return invSubWarehouseDao.filterGroupInvSubDown(filterInvSubWarehouseRequest); } + + @Override + public List filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest) { + return invSubWarehouseDao.filterSubInvList(filterInvWarehouseRequest); + } } diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml index 85e399ac..569ca918 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml @@ -442,6 +442,8 @@ AND ipd.invSpaceCode = #{invSpaceCode} + + AND bp.cplb = #{cplb} group by ip.id diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml index b184fb97..0417bf3e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml @@ -230,4 +230,27 @@ group by inv_warehouse_sub.id + + \ No newline at end of file diff --git a/api-admin/src/main/resources/schemas/schema_v2.1.sql b/api-admin/src/main/resources/schemas/schema_v2.1.sql index 851ba98f..4deb6247 100644 --- a/api-admin/src/main/resources/schemas/schema_v2.1.sql +++ b/api-admin/src/main/resources/schemas/schema_v2.1.sql @@ -4,11 +4,11 @@ CALL Pro_Temp_ColumnWork ('basic_export_status','receiveStatus','varchar(255) ', CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1); CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1); -INSERT ignore INTO scheduled(id, cronName, cron, customerId, remark) +INSERT ignore INTO sys_scheduled(id, cronName, cron, customerId, remark) VALUES (16, 'ScheduledDeletion', '0 0 2 1/1 * ? ', NULL, '删除30天数据'); -INSERT ignore INTO system_param_config ( id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, paramExplain ) +INSERT ignore INTO sys_param_config ( id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, paramExplain ) VALUES ( 20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是，0：否' ); From 27c5f093c2e6c257e3dd1efe65899c0cff6d6773 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 16 Dec 2022 15:43:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=85=BB=E6=8A=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeviceCollectDetailController.java | 16 +++++ .../inventory/DeviceMAOrderController.java | 16 +++++ .../DeviceMAOrderDetailCotroller.java | 15 +++++ .../dao/inventory/DeviceCollectOrderDao.java | 2 + .../DeviceCollectOrderDetailDao.java | 17 ++++++ .../admin/dao/inventory/DeviceMAOrderDao.java | 3 + .../dao/inventory/DeviceMaOrderDetailDao.java | 11 ++++ .../InvMaintenanceExplanationDao.java | 2 + .../dao/inventory/InvMaintenanceOrderDao.java | 2 + .../InvMaintenanceOrderDetailDao.java | 2 + .../inventory/AddDeviceMAOrderRequest.java | 45 ++++++++++++++ ...FilterDeviceCollectOrderDetailRequest.java | 15 +++++ .../DeviceCollectOrderDetailResponse.java | 5 ++ .../DeviceCollectOrderDetailService.java | 8 +++ .../inventory/DeviceMAOrderDetailService.java | 7 +++ .../inventory/DeviceMAOrderService.java | 8 +++ .../DeviceCollectOrderDetailServiceImpl.java | 14 ++++- .../impl/DeviceMAOrderDetailServiceImpl.java | 14 +++++ .../impl/DeviceMAOrderServiceImpl.java | 41 ++++++++++++- .../inventory/DeviceCollectOrderDetailDao.xml | 61 +++++++++++++++++++ .../inventory/DeviceMAOrderDetailDao.xml | 14 +++++ 21 files changed, 316 insertions(+), 2 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceMAOrderRequest.java diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceCollectDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceCollectDetailController.java index a8ba051e..74155c6e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceCollectDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceCollectDetailController.java @@ -112,4 +112,20 @@ public class DeviceCollectDetailController { return detailService.deleteOrderDetail(detailRequest); } + /** + * 查询设备资产列表 + * + * @param detailRequest + * @return + */ + @GetMapping("/device/collect/order/detail/deviceList") + public BaseResponse deviceList(FilterDeviceCollectOrderDetailRequest detailRequest) { + List list = detailService.getDeviceList(detailRequest); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setList(list); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + return ResultVOUtils.success(pageSimpleResponse); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java index 5856f1aa..f20931b4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java @@ -2,6 +2,7 @@ package com.glxp.api.admin.controller.inventory; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; +import com.glxp.api.admin.req.inventory.AddDeviceMAOrderRequest; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.service.inventory.DeviceMAOrderService; @@ -92,5 +93,20 @@ public class DeviceMAOrderController { return deviceMAOrderService.deleteDeviceMAOrder(filterDeviceMAOrderRequest.getId()); } + /** + * 添加设备养护记录 + * + * @param addDeviceMAOrderRequest + * @param bindingResult + * @return + */ + @PostMapping("/device/MA/order/addDeviceMAOrder") + public BaseResponse addDeviceMAOrder(@RequestBody AddDeviceMAOrderRequest addDeviceMAOrderRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + return deviceMAOrderService.addDeviceMAOrder(addDeviceMAOrderRequest); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderDetailCotroller.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderDetailCotroller.java index 14518206..a7d62a83 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderDetailCotroller.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderDetailCotroller.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.controller.inventory; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderDetailRequest; @@ -88,4 +89,18 @@ public class DeviceMAOrderDetailCotroller { return deviceMAOrderDetailService.deleteDetail(detailEntity); } + /** + * 养护设备信息接口 + * + * @param code + * @return + */ + @GetMapping("/device/MA/order/detail/filterMAOrderDetail") + public BaseResponse filterMAOrderDetail(String code) { + if (StrUtil.isBlank(code)) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + return deviceMAOrderDetailService.filterMAOrderDetail(code); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDao.java index b2a3f611..aeae033a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDao.java @@ -3,10 +3,12 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity; import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderRequest; import com.glxp.api.admin.res.inventory.DeviceCollectOrderResponse; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface DeviceCollectOrderDao { int deleteByPrimaryKey(Integer id); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java index 7103535b..b6651d77 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java @@ -3,10 +3,12 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderDetailRequest; import com.glxp.api.admin.res.inventory.DeviceCollectOrderDetailResponse; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface DeviceCollectOrderDetailDao { int deleteByPrimaryKey(Integer id); @@ -45,4 +47,19 @@ public interface DeviceCollectOrderDetailDao { */ List selectList(FilterDeviceCollectOrderDetailRequest filterDeviceCollectOrderDetailRequest); + /** + * 查询设备资产列表 + * + * @param detailRequest + * @return + */ + List selectDeviceList(FilterDeviceCollectOrderDetailRequest detailRequest); + + /** + * 根据码查询单条设备领用详情 + * + * @param code + * @return + */ + DeviceCollectOrderDetailEntity findOneByCode(@Param("code") String code); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java index d424d856..3f90f8de 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java @@ -3,10 +3,13 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; +import org.apache.ibatis.annotations.Mapper; import java.util.List; +@Mapper public interface DeviceMAOrderDao { + int deleteByPrimaryKey(Integer id); int insert(DeviceMAOrderEntity record); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDetailDao.java index 236ed0cd..d110f5f6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDetailDao.java @@ -3,11 +3,14 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderDetailRequest; import com.glxp.api.admin.res.inventory.DeviceMAOrderDetailResponse; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface DeviceMaOrderDetailDao { + int deleteByPrimaryKey(Integer id); int insert(DeviceMAOrderDetailEntity record); @@ -31,4 +34,12 @@ public interface DeviceMaOrderDetailDao { * @return */ List selectByOrderId(@Param("orderId") String orderId); + + /** + * 查询设备养护记录详情展示信息 + * + * @param productId + * @return + */ + DeviceMAOrderDetailResponse filterMAOrderDetail(String productId); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceExplanationDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceExplanationDao.java index ac5821b7..61efdf30 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceExplanationDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceExplanationDao.java @@ -1,10 +1,12 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.InvMaintenanceExplanationEntity; +import org.apache.ibatis.annotations.Mapper; /** * 养护说明表Dao */ +@Mapper public interface InvMaintenanceExplanationDao { InvMaintenanceExplanationEntity selectByStatus(Integer status); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDao.java index c83a7d9a..b35eb5c3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDao.java @@ -3,10 +3,12 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderEntity; import com.glxp.api.admin.req.inventory.FilterInvMAOrderRequest; import com.glxp.api.admin.res.inventory.InvMAOrderResponse; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface InvMaintenanceOrderDao { int deleteByPrimaryKey(Integer id); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDetailDao.java index 8423236a..9a85c550 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDetailDao.java @@ -3,10 +3,12 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderDetailEntity; import com.glxp.api.admin.req.inventory.FilterInvMAOrderDetailRequest; import com.glxp.api.admin.res.inventory.InvMAOrderDetailResponse; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface InvMaintenanceOrderDetailDao { int deleteByPrimaryKey(Integer id); diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceMAOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceMAOrderRequest.java new file mode 100644 index 00000000..6ad348e7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceMAOrderRequest.java @@ -0,0 +1,45 @@ +package com.glxp.api.admin.req.inventory; + +import lombok.Data; + +/** + * 添加设备养护记录请求参数 + */ +@Data +public class AddDeviceMAOrderRequest { + + /** + * 设备号 + */ + private String code; + + /** + * 创建人 + */ + private String createUser; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 创建时间 + */ + private String createTime; + + /** + * 养护状态 + */ + private Integer maintenanceStatus; + + /** + * 设备状态 + */ + private Integer deviceStatus; + + /** + * 备注 + */ + private String remark; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderDetailRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderDetailRequest.java index 6565daaf..c02c852f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderDetailRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderDetailRequest.java @@ -24,4 +24,19 @@ public class FilterDeviceCollectOrderDetailRequest extends ListPageRequest { */ private String code; + /** + * DI + */ + private String nameCode; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 领用人 + */ + private String collectUser; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderDetailResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderDetailResponse.java index 53ae48e8..42948328 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderDetailResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderDetailResponse.java @@ -49,4 +49,9 @@ public class DeviceCollectOrderDetailResponse extends DeviceCollectOrderDetailEn */ private Boolean editSerialNo; + /** + * 部门名称 + */ + private String deptName; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceCollectOrderDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceCollectOrderDetailService.java index 66ed5f94..2dc0ce23 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceCollectOrderDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceCollectOrderDetailService.java @@ -52,4 +52,12 @@ public interface DeviceCollectOrderDetailService { * @return */ BaseResponse checkCode(String code); + + /** + * 查询设备资产列表 + * + * @param detailRequest + * @return + */ + List getDeviceList(FilterDeviceCollectOrderDetailRequest detailRequest); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderDetailService.java index 1b7c92f3..e0fe0467 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderDetailService.java @@ -21,4 +21,11 @@ public interface DeviceMAOrderDetailService { BaseResponse deleteDetail(DeviceMAOrderDetailEntity detailEntity); + /** + * 根据条码查询养护设备展示信息 + * + * @param code + * @return + */ + BaseResponse filterMAOrderDetail(String code); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java index 8be29d71..5f4fc68c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java @@ -1,6 +1,7 @@ package com.glxp.api.admin.service.inventory; import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; +import com.glxp.api.admin.req.inventory.AddDeviceMAOrderRequest; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; import com.glxp.api.common.res.BaseResponse; @@ -43,4 +44,11 @@ public interface DeviceMAOrderService { */ BaseResponse deleteDeviceMAOrder(Integer id); + /** + * 添加设备养护记录 + * + * @param addDeviceMAOrderRequest + * @return + */ + BaseResponse addDeviceMAOrder(AddDeviceMAOrderRequest addDeviceMAOrderRequest); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderDetailServiceImpl.java index b2620d6f..223b30db 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderDetailServiceImpl.java @@ -57,7 +57,7 @@ public class DeviceCollectOrderDetailServiceImpl implements DeviceCollectOrderDe List list = deviceCollectOrderDetailDao.filterList(detailRequest); //设置是否可以自定义序列号标识 list.forEach(item -> { - item.setEditSerialNo(StrUtil.isBlank(item.getCode()) ? true : false); + item.setEditSerialNo(StrUtil.isBlank(item.getCode())); }); return list; } @@ -244,4 +244,16 @@ public class DeviceCollectOrderDetailServiceImpl implements DeviceCollectOrderDe } return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "此条码在库存中不存在，无法领用！"); } + + @Override + public List getDeviceList(FilterDeviceCollectOrderDetailRequest detailRequest) { + if (null == detailRequest) { + return Collections.emptyList(); + } + if (null != detailRequest.getPage() && null != detailRequest.getLimit()) { + PageHelper.offsetPage((detailRequest.getPage() - 1) * detailRequest.getLimit(), detailRequest.getLimit()); + } + return deviceCollectOrderDetailDao.selectDeviceList(detailRequest); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java index 5a680250..0dd18ad6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java @@ -2,7 +2,9 @@ package com.glxp.api.admin.service.inventory.impl; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.inventory.DeviceCollectOrderDetailDao; import com.glxp.api.admin.dao.inventory.DeviceMaOrderDetailDao; +import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderDetailRequest; import com.glxp.api.admin.res.inventory.DeviceMAOrderDetailResponse; @@ -25,6 +27,8 @@ public class DeviceMAOrderDetailServiceImpl implements DeviceMAOrderDetailServic @Resource private DeviceMaOrderDetailDao deviceMaOrderDetailDao; + @Resource + private DeviceCollectOrderDetailDao deviceCollectOrderDetailDao; @Override public List filterList(FilterDeviceMAOrderDetailRequest detailRequest) { @@ -71,4 +75,14 @@ public class DeviceMAOrderDetailServiceImpl implements DeviceMAOrderDetailServic } return ResultVOUtils.success("删除成功"); } + + @Override + public BaseResponse filterMAOrderDetail(String code) { + DeviceCollectOrderDetailEntity deviceCollectOrderDetail = deviceCollectOrderDetailDao.findOneByCode(code); + DeviceMAOrderDetailResponse response = deviceMaOrderDetailDao.filterMAOrderDetail(deviceCollectOrderDetail.getProductId()); + response.setCode(code); + response.setDeviceStatus(1); + response.setMaintenanceStatus(0); + return ResultVOUtils.success(response); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java index ee543267..89bf388f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java @@ -9,6 +9,7 @@ import com.glxp.api.admin.dao.inventory.DeviceMaOrderDetailDao; import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; +import com.glxp.api.admin.req.inventory.AddDeviceMAOrderRequest; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; import com.glxp.api.admin.service.auth.CustomerService; import com.glxp.api.admin.service.inventory.DeviceMAOrderService; @@ -98,7 +99,7 @@ public class DeviceMAOrderServiceImpl implements DeviceMAOrderService { } if (deviceMAOrderEntity.getStatus() == 1) { //完成养护记录更新，查询此条养护记录详情中是否存在未养护完成设备 - List detailList = deviceMaOrderDetailDao.selectByOrderId(deviceMAOrderEntity.getOrderId()); + List detailList = deviceMaOrderDetailDao.selectByOrderId(deviceMAOrderEntity.getOrderId()); for (DeviceMAOrderDetailEntity deviceMAOrderDetailEntity : detailList) { if (deviceMAOrderDetailEntity.getMaintenanceStatus() == 0) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "存在未养护设备，请完成该设备养护！"); @@ -124,4 +125,42 @@ public class DeviceMAOrderServiceImpl implements DeviceMAOrderService { return ResultVOUtils.success("删除成功！"); } + @Override + public BaseResponse addDeviceMAOrder(AddDeviceMAOrderRequest addDeviceMAOrderRequest) { + if (null == addDeviceMAOrderRequest) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + if (StrUtil.isBlank(addDeviceMAOrderRequest.getCode())) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + //生成设备养护记录和详情 + DeviceMAOrderEntity deviceMAOrderEntity = new DeviceMAOrderEntity(); + deviceMAOrderEntity.setOrderId(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_MA_ORDER, "yyyyMMdd"))); + deviceMAOrderEntity.setCreateUser(addDeviceMAOrderRequest.getCreateUser()); + deviceMAOrderEntity.setCreateTime(addDeviceMAOrderRequest.getCreateTime()); + deviceMAOrderEntity.setUpdateTime(DateUtil.getDateTime()); + deviceMAOrderEntity.setStatus(1); + + //查询领用详情表中此条码的数据 + DeviceCollectOrderDetailEntity deviceCollectOrderDetail = deviceCollectOrderDetailDao.findOneByCode(addDeviceMAOrderRequest.getCode()); + //详情 + DeviceMAOrderDetailEntity detailEntity = new DeviceMAOrderDetailEntity(); + detailEntity.setCreateTime(addDeviceMAOrderRequest.getCreateTime()); + detailEntity.setOrderIdFk(deviceMAOrderEntity.getOrderId()); + detailEntity.setCreateUser(detailEntity.getCreateUser()); + detailEntity.setCode(addDeviceMAOrderRequest.getCode()); + detailEntity.setNameCode(deviceCollectOrderDetail.getNameCode()); + detailEntity.setBatchNo(deviceCollectOrderDetail.getBatchNo()); + detailEntity.setProductId(deviceCollectOrderDetail.getProductId()); + detailEntity.setProduceDate(deviceCollectOrderDetail.getProduceDate()); + detailEntity.setExpireDate(deviceCollectOrderDetail.getExpireDate()); + detailEntity.setSerialNo(deviceCollectOrderDetail.getSerialNo()); + detailEntity.setMaintenanceStatus(addDeviceMAOrderRequest.getMaintenanceStatus()); + detailEntity.setDeviceStatus(addDeviceMAOrderRequest.getDeviceStatus()); + + deviceMAOrderDao.insert(deviceMAOrderEntity); + deviceMaOrderDetailDao.insert(detailEntity); + return ResultVOUtils.success(); + } + } diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml index be3ee078..6d987320 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml @@ -334,4 +334,65 @@ + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml index 46da97d1..233b10ed 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml @@ -266,4 +266,18 @@ select from device_ma_order_detail where orderIdFk = #{orderId} + + \ No newline at end of file From d9578b597ff7ed97ebabef9e8bf61eeaae2918f6 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 16 Dec 2022 17:32:03 +0800 Subject: [PATCH 4/5] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/AuthAdminController.java | 8 ++++---- .../thrsys/ThrOrderReceiveController.java | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java index d490537d..c3a2e36d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java @@ -13,10 +13,7 @@ import com.glxp.api.admin.req.auth.AuthAdminSaveRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.auth.AuthAdminResponse; import com.glxp.api.admin.res.auth.AuthAdminRoleResponse; -import com.glxp.api.admin.service.auth.AuthAdminService; -import com.glxp.api.admin.service.auth.AuthRoleAdminService; -import com.glxp.api.admin.service.auth.AuthRoleService; -import com.glxp.api.admin.service.auth.DeptService; +import com.glxp.api.admin.service.auth.*; import com.glxp.api.admin.service.inventory.InvSubWarehouseService; import com.glxp.api.admin.util.GennerOrderUtils; import com.glxp.api.admin.util.PasswordUtils; @@ -52,6 +49,8 @@ public class AuthAdminController { private InvSubWarehouseService invSubWarehouseService; @Resource private DeptService deptService; + @Resource + private CustomerService customerService; /** * 获取管理员列表 @@ -158,6 +157,7 @@ public class AuthAdminController { } authAdmin.setLastModifyTime(new Date()); + authAdmin.setCustomerId(customerService.getUserBean().getCustomerId()); authAdmin.setId(gennerOrderUtils.getRelId()); boolean b = authAdminService.insertAuthAdmin(authAdmin); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderReceiveController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderReceiveController.java index c05aa2e1..e98caa44 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderReceiveController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderReceiveController.java @@ -55,21 +55,21 @@ public class ThrOrderReceiveController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } Integer userId = customerService.getUserId(); - ThrOrderEntity stockOrderEntity = new ThrOrderEntity(); - BeanUtils.copyProperties(stockOrderPostRequest, stockOrderEntity); - stockOrderEntity.setCreateUser(userId + ""); - stockOrderEntity.setType(1);//领用单据 - stockOrderEntity.setUpdateTime(new Date()); - stockOrderEntity.setBilldate(DateUtil.parse(stockOrderEntity.getBilldate(), DatePattern.NORM_DATETIME_PATTERN).toString()); + ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); + BeanUtils.copyProperties(stockOrderPostRequest, thrOrderEntity); + thrOrderEntity.setCreateUser(userId + ""); + thrOrderEntity.setType(1);//领用单据 + thrOrderEntity.setUpdateTime(new Date()); + thrOrderEntity.setBilldate(DateUtil.parse(thrOrderEntity.getBilldate(), DatePattern.NORM_DATETIME_PATTERN).toString()); String orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.LIN_YONG, "yyyyMMdd")); - stockOrderEntity.setBillNo(orderNo); - thrOrderService.insertThrOrder(stockOrderEntity); + thrOrderEntity.setBillNo(orderNo); + thrOrderService.insertThrOrder(thrOrderEntity); if (stockOrderPostRequest.getSubErpOrders() != null) { List stockOrderDetailEntityList = stockOrderPostRequest.getSubErpOrders(); for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) { ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); BeanUtils.copyProperties(stockOrderDetailEntity, thrOrderDetailEntity); - thrOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId() + ""); + thrOrderDetailEntity.setOrderIdFk(thrOrderEntity.getId() + ""); thrOrderDetailEntity.setReCount( stockOrderDetailEntity.getReCount()); thrOrderDetailEntity.setCount( From 064ccaef2b841c254d89dd535c96512715997f29 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 19 Dec 2022 11:31:51 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1.=E7=A7=BB=E9=99=A4=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=88=B0=E8=87=AA=E5=8A=A9=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/info/PlatformController.java | 250 ---------------- .../controller/inout/OrderController.java | 87 ------ .../glxp/api/admin/dao/info/PlatformDao.java | 39 --- .../dao/inout/UnitMaintainPlatformDao.java | 41 --- .../inout/UnitMaintainPlatformEntity.java | 63 ---- .../admin/req/inout/PlatformLinkRequest.java | 41 --- .../inout/PostUdimsOrderDetailRequest.java | 35 --- .../req/inout/PostUdimsOrderRequest.java | 61 ---- .../admin/service/info/PlatformService.java | 101 ------- .../info/impl/PlatformServiceImpl.java | 272 ------------------ .../com/glxp/api/admin/util/HttpClient.java | 18 -- .../mybatis/mapper/info/PlatformDao.xml | 106 ------- .../mapper/inout/UnitMaintainPlatformDao.xml | 133 --------- .../main/resources/schemas/schema_v2.1.sql | 5 + 14 files changed, 5 insertions(+), 1247 deletions(-) delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/info/PlatformController.java delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/info/PlatformDao.java delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/inout/UnitMaintainPlatformDao.java delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/inout/UnitMaintainPlatformEntity.java delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/inout/PlatformLinkRequest.java delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/inout/PostUdimsOrderDetailRequest.java delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/inout/PostUdimsOrderRequest.java delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/info/PlatformService.java delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/info/impl/PlatformServiceImpl.java delete mode 100644 api-admin/src/main/resources/mybatis/mapper/info/PlatformDao.xml delete mode 100644 api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/PlatformController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/info/PlatformController.java deleted file mode 100644 index 60e36d66..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/PlatformController.java +++ /dev/null @@ -1,250 +0,0 @@ -package com.glxp.api.admin.controller.info; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.info.PlatformEntity; -import com.glxp.api.admin.entity.inout.UnitMaintainPlatformEntity; -import com.glxp.api.admin.req.info.PlatformUserInfoRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inout.PlatformLinkRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.info.PlatformLinkResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.info.PlatformService; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.client.RestTemplate; - -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@RestController -@Slf4j -public class PlatformController { - - @Resource - private PlatformService platformService; - @Resource - private CustomerService customerService; - - @AuthRuleAnnotation("") - @PostMapping("/udiwms/platform/remove") - public BaseResponse remove(@RequestBody PlatformEntity platformEntity) { - if (platformService.remove(platformEntity.getId()) > 0) { - ResultVOUtils.success("删除成功"); - } - return ResultVOUtils.error(500, "删除失败"); - } - - - @AuthRuleAnnotation("") - @PostMapping("/udiwms/platform/update") - public BaseResponse update(@RequestBody PlatformEntity platformEntity) { - if (StrUtil.isBlank(platformEntity.getName()) || StrUtil.isBlank(platformEntity.getHost())) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空"); - } - return platformService.update(platformEntity); - } - - @AuthRuleAnnotation("") - @GetMapping("/udiwms/platform/list") - public BaseResponse list(@RequestParam Map params) { - List list = platformService.list(params); - PageInfo pageInfo = new PageInfo<>(list); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(pageInfo.getList()); - return ResultVOUtils.success(pageSimpleResponse); - } - - /** - * 测试账号连通性 - * - * @return - */ - @AuthRuleAnnotation("") - @PostMapping("/udiwms/platform/testUserInfo") - public BaseResponse testUserInfo(@RequestBody PlatformUserInfoRequest platformUserInfoRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - - PlatformEntity platformEntity = platformService.getPlatformById(platformUserInfoRequest.getPlatformId()); - if (null == platformEntity || StrUtil.isBlank(platformEntity.getHost())) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - - String url = platformEntity.getHost() + "/verify"; - Map map = new HashMap<>(); - map.put("username", platformUserInfoRequest.getUsername()); - map.put("password", platformUserInfoRequest.getPassword()); - - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_JSON_UTF8); - - HttpEntity request = new HttpEntity<>(JSON.toJSONString(map), headers); - RestTemplate restTemplate = new RestTemplate(); - log.error(url); - - String result = restTemplate.postForObject(url, request, String.class, map); - log.error(result); - Map object = JSON.parseObject(result, Map.class); - if (!String.valueOf(object.get("code")).equals("20000")) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, String.valueOf(object.get("message"))); - } - return ResultVOUtils.success(); - } - - @AuthRuleAnnotation("") - @PostMapping("/udiwms/platform/link") - public BaseResponse update(@RequestBody PlatformLinkRequest platformLinkRequest) { - //判断此数据是否重复 - String verifyResult = platformService.verifyUnitMaintainPlatform(platformLinkRequest); - if (!verifyResult.equals("success")) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, verifyResult); - } - - platformLinkRequest.setCustomerId(String.valueOf(customerService.getUserBean().getCustomerId())); - - PlatformEntity platformEntity = platformService.get(platformLinkRequest.getPlatformId()); - if (platformEntity != null) { - String url = platformEntity.getHost() + "/verify"; - - Map map = new HashMap(); - map.put("username", platformLinkRequest.getPlatformUsername()); - map.put("password", platformLinkRequest.getPlatformPassword()); - - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_JSON_UTF8); - - HttpEntity request = new HttpEntity(JSON.toJSONString(map), headers); - RestTemplate restTemplate = new RestTemplate(); - log.error(url); - - String result = restTemplate.postForObject(url, request, String.class, map); - log.error(result); - Map object = JSON.parseObject(result, Map.class); - - if (object != null && object.get("data") != null) { - Map data = JSON.parseObject(JSON.toJSONString(object.get("data")), Map.class); - log.error(JSON.toJSONString(object.get("data"))); - if (data.get("appid") != null) { - platformLinkRequest.setAppid(data.get("appid").toString()); - if (data.get("apiKey") != null) { - platformLinkRequest.setApiKey(data.get("apiKey").toString()); - } - if (data.get("secretKey") != null) { - platformLinkRequest.setSecretKey(data.get("secretKey").toString()); - } - } else { - return ResultVOUtils.error(500, "关联验证失败,请联系管理人员"); - } - } else if (object != null && object.get("message") != null) { - return ResultVOUtils.error(500, object.get("message").toString()); - } else { - return ResultVOUtils.error(500, "关联失败,请联系管理人员"); - } - } else { - return ResultVOUtils.error(500, "未查询到平台信息"); - } - UnitMaintainPlatformEntity unitMaintainPlatform = new UnitMaintainPlatformEntity(); - BeanUtil.copyProperties(platformLinkRequest, unitMaintainPlatform); - platformService.saveUnitPlatform(unitMaintainPlatform); - return ResultVOUtils.success("关联成功"); - } - - /** - * 获取往来单位与自助平台关联数据 - */ - @AuthRuleAnnotation("") - @GetMapping("/udiwms/platform/getLinkPlatformList") - public BaseResponse getLinkPlatformList(PlatformLinkRequest platformLinkRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - platformLinkRequest.setCustomerId(String.valueOf(customerService.getUserBean().getCustomerId())); - List list = platformService.getLinkPlatformList(platformLinkRequest); - PageInfo pageInfo = new PageInfo<>(list); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(pageInfo.getList()); - return ResultVOUtils.success(pageSimpleResponse); - } - - /** - * 解绑往来单位和自助平台的关联 - * - * @param corpId - * @return - */ - @AuthRuleAnnotation("") - @PostMapping("/udiwms/platform/unbind") - public BaseResponse unbindPlatform(DeleteRequest deleteRequest) { - if (StrUtil.isBlank(deleteRequest.getId())) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - platformService.unbindPlatform(deleteRequest.getId()); - return ResultVOUtils.success(); - } - - /** - * 获取对应平台单据类型 - * - * @return - */ - @AuthRuleAnnotation("") - @GetMapping("/udiwms/platform/getTargetActions") - public BaseResponse getTargetActions(String platformId, String invSubCode) { - if (StrUtil.isBlank(platformId)) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - return platformService.getTargetActions(platformId, invSubCode); - } - - - @AuthRuleAnnotation("") - @GetMapping("/udiwms/platform/getTargetInv") - public BaseResponse getTargetInv(String platformId) { - if (StrUtil.isBlank(platformId)) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - return platformService.getTargetInv(platformId); - } - - @AuthRuleAnnotation("") - @GetMapping("/udiwms/platform/getTargetSubInv") - public BaseResponse getTargetSubInv(String platformId, String invCode) { - if (StrUtil.isBlank(platformId)) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - return platformService.getTargetSubInv(platformId, invCode); - } - - /** - * 测试自助平台连通性 - * - * @param host - * @return - */ - @AuthRuleAnnotation("") - @GetMapping("udiwms/platform/testPlatformConnection") - public BaseResponse testPlatformConnection(String host) { - if (StrUtil.isBlank(host)) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - return platformService.testPlatformConnection(host); - } - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index 8399a5ac..b06e59cc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -3,9 +3,7 @@ package com.glxp.api.admin.controller.inout; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.constant.Constant; @@ -19,9 +17,7 @@ import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.basic.BussinessTypeEntity; import com.glxp.api.admin.entity.basic.EntrustReceEntity; import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.info.PlatformEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.inout.*; import com.glxp.api.admin.entity.inventory.InvBusUserEntity; @@ -42,7 +38,6 @@ import com.glxp.api.admin.service.basic.EntrustReceService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.business.StockOrderDetailService; import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.service.info.PlatformService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.*; import com.glxp.api.admin.service.inventory.InvBusUserService; @@ -113,8 +108,6 @@ public class OrderController { @Resource InvBusUserService invBusUserService; - @Resource - private PlatformService platformService; @Resource private StockOrderDetailService stockOrderDetailService; @Resource @@ -867,84 +860,4 @@ public class OrderController { return ResultVOUtils.success(orderEntity); } - @AuthRuleAnnotation("") - @PostMapping("/warehouse/inout/order/uploadSpms") - public BaseResponse uploadSpms(@RequestBody OrderUploadRequest orderUploadRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (orderUploadRequest.getOrderIds() != null && orderUploadRequest.getOrderIds().size() > 0) { - PostUdimsOrderRequest postUdimsOrderRequest = new PostUdimsOrderRequest(); - List orderBeans = new ArrayList<>(); - String orderId = orderUploadRequest.getOrderIds().get(0); - OrderEntity orderEntity = orderService.findById(orderId); - UnitMaintainPlatformEntity unitMaintainPlatform = platformService.findLinkData(customerService.getUserBean().getCustomerId(), orderEntity.getAction(), orderEntity.getFromCorpId()); - if (unitMaintainPlatform == null || unitMaintainPlatform.getAppid() == null) { - return ResultVOUtils.error(500, "该往来单位未绑定UDI自助平台！"); - } - if (!orderEntity.getAction().equals(unitMaintainPlatform.getSourceAction())) { - return ResultVOUtils.error(500, "该单据类型不支持提交！"); - } - PostUdimsOrderRequest.OrderBean orderBean = new PostUdimsOrderRequest.OrderBean(); - BeanUtils.copyProperties(orderEntity, orderBean); - orderBean.setAction(unitMaintainPlatform.getTargetAction()); - orderBean.setInvStorageCode(unitMaintainPlatform.getInvCode()); - orderBean.setInvWarehouseCode(unitMaintainPlatform.getInvSubCode()); - WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); - warehouseQueryRequest.setOrderId(orderEntity.getId()); - List warehouseEntities = codesService.findByOrderId(warehouseQueryRequest); - List codeBeans = new ArrayList<>(); - warehouseEntities.forEach(data -> { - PostUdimsOrderRequest.OrderBean.CodeBean codeBean = new PostUdimsOrderRequest.OrderBean.CodeBean(); - BeanUtils.copyProperties(data, codeBean); - codeBean.setInvStorageCode(unitMaintainPlatform.getInvCode()); - codeBean.setInvWarehouseCode(unitMaintainPlatform.getInvSubCode()); - codeBeans.add(codeBean); - }); - //查询单据详情 - FilterOrderDetailRequest filterOrderDetailRequest = new FilterOrderDetailRequest(); - filterOrderDetailRequest.setOrderId(orderBean.getOrderId()); - //查询业务单据详情 - List orderDetailList = stockOrderDetailService.findByScanOrderId(orderBean.getOrderId()); - if (CollUtil.isNotEmpty(orderDetailList)) { - List orderDetails = new ArrayList<>(); - for (StockOrderDetailEntity stockOrderDetailEntity : orderDetailList) { - PostUdimsOrderDetailRequest orderDetail = new PostUdimsOrderDetailRequest(); - orderDetail.setUuidFk(udiRelevanceService.findUuidById(stockOrderDetailEntity.getRelId())); - orderDetail.setFirstSalesInvNo(stockOrderDetailEntity.getFirstSalesInvNo()); - orderDetail.setSecSalesInvNo(stockOrderDetailEntity.getSecSalesInvNo()); - orderDetail.setPrice(stockOrderDetailEntity.getPrice()); - orderDetail.setInvoiceDate(stockOrderDetailEntity.getInvoiceDate()); - orderDetail.setSecSalesListNo(stockOrderDetailEntity.getSecSalesListNo()); - orderDetail.setBatchNo(stockOrderDetailEntity.getBatchNo()); - orderDetails.add(orderDetail); - } - orderBean.setOrderDetails(orderDetails); - } - orderBean.setCodes(codeBeans); - orderBeans.add(orderBean); - postUdimsOrderRequest.setOrderBeans(orderBeans); - PlatformEntity platformEntity = platformService.get(unitMaintainPlatform.getPlatformId()); - postUdimsOrderRequest.setOrderBeans(orderBeans); - - - log.info("提交单据到自助平台，单据数据：{}", JSONUtil.toJsonStr(postUdimsOrderRequest)); - String response = - HttpClient.uCloudPostSmp(platformEntity.getHost() + "/warehouse/inout/postOrdersUdims", - postUdimsOrderRequest, unitMaintainPlatform.getApiKey(), unitMaintainPlatform.getSecretKey()); - log.info("自助平台响应结果：{}", response); - BaseResponse baseResponse = - JSONObject.parseObject(response, new TypeReference() { - }); - if (baseResponse.getCode() == 20000) { - orderEntity.setUploadStatus("1"); - orderService.updateOrder(orderEntity); - return baseResponse; - } else { - return ResultVOUtils.error(500, baseResponse.getMessage()); - } - } - return ResultVOUtils.success("未选择订单！"); - } - } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/PlatformDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/info/PlatformDao.java deleted file mode 100644 index 297a9503..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/info/PlatformDao.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.glxp.api.admin.dao.info; - -import com.glxp.api.admin.entity.info.PlatformEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -@Mapper -public interface PlatformDao{ - - int batchSave(List list); - - List list( Map map); - - int count(Map map); - - PlatformEntity get(String id); - - /** - * 根据名称和访问地址查询平台信息 - * - * @param name - * @param host - * @return - */ - List selectByNameAndHost(@Param("name") String name, @Param("host") String host); - - PlatformEntity selectById(@Param("platformId") String platformId); - - int insert(PlatformEntity platformEntity); - - List selectList(@Param("id") String id, @Param("name") String name, @Param("host") String host); - - int deleteById(@Param("id") String id); - - void updateById(PlatformEntity platformEntity); -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/UnitMaintainPlatformDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/UnitMaintainPlatformDao.java deleted file mode 100644 index 3a884e67..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/UnitMaintainPlatformDao.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.glxp.api.admin.dao.inout; - -import com.glxp.api.admin.entity.inout.UnitMaintainPlatformEntity; -import com.glxp.api.admin.req.inout.PlatformLinkRequest; -import com.glxp.api.admin.res.info.PlatformLinkResponse; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface UnitMaintainPlatformDao{ - - /** - * 查询医院客户列表 - * - * @param page - * @param customerId - * @param key - * @return - */ - List getLinkPlatformList(@Param("customerId") String customerId, @Param("key") String key); - - /** - * 根据客户ID查询关联数据 - * - * @param customerId - * @return - */ - List selectByCustomerId(@Param("customerId") Long customerId); - - void updateById(UnitMaintainPlatformEntity maintainPlatform); - - void insert(UnitMaintainPlatformEntity unitMaintainPlatformEntity); - - List selectList(PlatformLinkRequest platformLinkRequest); - - UnitMaintainPlatformEntity findLinkData(@Param("customerId") long customerId, @Param("action") String action, @Param("unitId") String unitId); - - void deleteById(String id); -} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/UnitMaintainPlatformEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/UnitMaintainPlatformEntity.java deleted file mode 100644 index f8bcf925..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/UnitMaintainPlatformEntity.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.glxp.api.admin.entity.inout; - -import lombok.Data; - -/** - * 医院客户表 - */ -@Data -public class UnitMaintainPlatformEntity { - - private Integer id; - - /** - * 往来单位ID - */ - private String unitId; - - /** - * 客户ID - */ - private Long customerId; - - /** - * 平台ID - */ - private String platformId; - - /** - * 源单据类型 - */ - private String sourceAction; - - /** - * 目标单据类型 - */ - private String targetAction; - - /** - * 仓库码 - */ - private String invCode; - - /** - * 分库码 - */ - private String invSubCode; - - /** - * 应用名称 - */ - private String appid; - - /** - * 秘钥 - */ - private String secretKey; - - /** - * 应用ID - */ - private String apiKey; - -} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/PlatformLinkRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/PlatformLinkRequest.java deleted file mode 100644 index 0f776867..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/PlatformLinkRequest.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.glxp.api.admin.req.inout; - -import com.glxp.api.admin.req.ListPageRequest; -import lombok.Data; - -/** - * 医院客户请求参数 - */ -@Data -public class PlatformLinkRequest extends ListPageRequest { - - private Integer id; - - private String unitId; - - private String corpName; - - private String platformId; - - private String platformUsername; - - private String platformPassword; - - private String appid; - - private String apiKey; - - private String secretKey; - - private String sourceAction; - - private String targetAction; - - private String invCode; - - private String invSubCode; - - private String key; - - private String customerId; -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostUdimsOrderDetailRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostUdimsOrderDetailRequest.java deleted file mode 100644 index c4e247a7..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostUdimsOrderDetailRequest.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.glxp.api.admin.req.inout; - -import lombok.Data; - -import java.math.BigDecimal; - -/** - * udims单据上传，单据详情参数 - */ -@Data -public class PostUdimsOrderDetailRequest { - - //uuid - private String uuidFk; - - //批次号 - private String batchNo; - - //价格 - private BigDecimal price; - - //销售发票号（第一票） - private String firstSalesInvNo; - - //销售发票号（第二票） - private String secSalesInvNo; - - //销售清单号（第二票） - private String secSalesListNo; - - //开票日期 - private String invoiceDate; - - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostUdimsOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostUdimsOrderRequest.java deleted file mode 100644 index afa7c6f8..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostUdimsOrderRequest.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.glxp.api.admin.req.inout; - -import lombok.Data; - -import java.util.List; - -@Data -public class PostUdimsOrderRequest { - - List orderBeans; - private String customerId; - - - @Data - public static class OrderBean { - private String orderId; - private String corpOrderId; - private String action; - private String actDate; - private String actor; - private String mainAction; - private String fromCorpId; - private String fromCorp; - private String remark; - private String invStorageCode; - private String invWarehouseCode; - private List orderDetails; - private List codes; - - @Data - public static class CodeBean { - private String action; - private String mainAction; - private String code; - private String corpOrderId; - private String actor; - private String actDate; - private String fromCorpId; - private String fromCorp; - private String orderId; - private String batchNo; - private String produceDate; - private String expireDate; - private String serialNo; - private Integer count; - private String packageLevel; - private String warehouseCode; - - private String customerId; - private String nameCode; - private String supId;//供应商ID - private String invStorageCode; - private String invWarehouseCode; - private String relId; - private Integer status; - private String locStorageCode; - } - } - - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/PlatformService.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/PlatformService.java deleted file mode 100644 index 0a7b22e2..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/PlatformService.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.glxp.api.admin.service.info; - - -import com.glxp.api.admin.entity.info.PlatformEntity; -import com.glxp.api.admin.entity.inout.UnitMaintainPlatformEntity; -import com.glxp.api.admin.req.inout.PlatformLinkRequest; -import com.glxp.api.admin.res.info.PlatformLinkResponse; -import com.glxp.api.common.res.BaseResponse; - -import java.util.List; -import java.util.Map; - -public interface PlatformService { - - - public int save(PlatformEntity platformEntity); - - public int remove(String id); - - public BaseResponse update(PlatformEntity platformEntity); - - List list(Map map); - - int count(Map map); - - PlatformEntity get(String id); - - /** - * 查询往来单位和自助平台关联数据 - * - * @param platformLinkRequest - * @return - */ - List getLinkPlatformList(PlatformLinkRequest platformLinkRequest); - - /** - * 往来单位和自助平台解绑 - * - * @param id - */ - void unbindPlatform(String id); - - /** - * 获取自助平台单据类型 - * - * @param platformId - * @return - */ - BaseResponse getTargetActions(String platformId, String invSubCode); - - - //获取自助平台一级仓库 - BaseResponse getTargetInv(String platformId); - - - //获取自助平台一级仓库所属分库 - BaseResponse getTargetSubInv(String platformId, String invCode); - - /** - * 测试自助平台连通性 - * - * @param host - * @return - */ - BaseResponse testPlatformConnection(String host); - - /** - * 根据ID查询自助平台信息 - * - * @param platformId - * @return - */ - PlatformEntity getPlatformById(String platformId); - - /** - * 保存医院客户关联关系 - * - * @param unitMaintainPlatform - */ - void saveUnitPlatform(UnitMaintainPlatformEntity unitMaintainPlatform); - - /** - * 校验关联数据 - * - * @param platformLinkRequest - * @return - */ - public String verifyUnitMaintainPlatform(PlatformLinkRequest platformLinkRequest); - - /** - * 查询关联数据 - * - * @param customerId - * @param action - * @param unitId - * @return - */ - UnitMaintainPlatformEntity findLinkData(long customerId, String action, String unitId); - - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/PlatformServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/PlatformServiceImpl.java deleted file mode 100644 index 7b04b9e2..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/PlatformServiceImpl.java +++ /dev/null @@ -1,272 +0,0 @@ -package com.glxp.api.admin.service.info.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSON; -import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.info.PlatformDao; -import com.glxp.api.admin.dao.inout.UnitMaintainPlatformDao; -import com.glxp.api.admin.entity.info.PlatformEntity; -import com.glxp.api.admin.entity.inout.UnitMaintainPlatformEntity; -import com.glxp.api.admin.req.inout.PlatformLinkRequest; -import com.glxp.api.admin.res.info.PlatformLinkResponse; -import com.glxp.api.admin.service.info.PlatformService; -import com.glxp.api.admin.util.HttpClient; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Slf4j -@Service -@Transactional(rollbackFor = Exception.class) -public class PlatformServiceImpl implements PlatformService { - - @Resource - private PlatformDao platformDao; - @Resource - private UnitMaintainPlatformDao unitMaintainPlatformDao; - - public int save(PlatformEntity platformEntity) { - if (StringUtils.isEmpty(platformEntity.getId())) { - platformEntity.setId(String.valueOf(IdUtil.getSnowflake().nextId())); - } - return platformDao.insert(platformEntity); - } - - public int remove(String id) { - return platformDao.deleteById(id); - } - - public BaseResponse update(PlatformEntity platformEntity) { - if (StrUtil.isBlank(platformEntity.getId())) { - if (!verifyPlatformExist(platformEntity)) { - save(platformEntity); - return ResultVOUtils.success("添加成功"); - } else { - return ResultVOUtils.error(500, "已存在相同数据"); - } - } - platformDao.updateById(platformEntity); - return ResultVOUtils.success("更新成功"); - } - - private boolean verifyPlatformExist(PlatformEntity platformEntity) { - //校验名称和地址是否重复 - List list = platformDao.selectByNameAndHost(platformEntity.getName(), platformEntity.getHost()); - if (CollUtil.isEmpty(list)) { - return false; - } - return true; - } - - public List list(Map map) { - if (map.get("page") != null && map.get("limit") != null) { - Integer page = Integer.valueOf(String.valueOf(map.get("page"))); - Integer limit = Integer.valueOf(String.valueOf(map.get("limit"))); - PageHelper.offsetPage((page - 1) * limit, limit); - } - List list = platformDao.selectList(String.valueOf(map.get("id")), String.valueOf(map.get("name")), String.valueOf(map.get("host"))); - return list; - } - - public int count(Map map) { - return platformDao.count(map); - } - - public PlatformEntity get(String id) { - return platformDao.get(id); - } - - /** - * 查询往来单位和自助平台关联数据 - * - * @param platformLinkRequest - * @return - */ - public List getLinkPlatformList(PlatformLinkRequest platformLinkRequest) { - if (null == platformLinkRequest) { - return Collections.emptyList(); - } - if (null != platformLinkRequest.getPage() && null != platformLinkRequest.getLimit()) { - PageHelper.offsetPage((platformLinkRequest.getPage() - 1) * platformLinkRequest.getLimit(), platformLinkRequest.getLimit()); - } - return unitMaintainPlatformDao.getLinkPlatformList(platformLinkRequest.getCustomerId(), platformLinkRequest.getKey()); - } - - /** - * 往来单位和自助平台解绑 - * - * @param id - */ - public void unbindPlatform(String id) { - unitMaintainPlatformDao.deleteById(id); - } - - /** - * 获取自助平台单据类型 - * - * @param platformId - * @return - */ - public BaseResponse getTargetActions(String platformId, String invSubCode) { - PlatformEntity platformEntity = platformDao.get(platformId); - if (null == platformEntity) { - return ResultVOUtils.success(); - } - String host = platformEntity.getHost(); - Map paramMap = new HashMap<>(); - paramMap.put("invSubCode", invSubCode); - String resp = HttpClient.mipsGet(host + "/udiwms/bussinessType/udimsFilter", paramMap); - if (StrUtil.isNotBlank(resp) && resp.contains("20000")) { - return JSON.parseObject(resp, BaseResponse.class); - } else { - log.error("获取自助平台单据类型异常"); - return ResultVOUtils.error(500, "获取自助平台接口异常"); - } - } - - //获取自助平台一级仓库 - public BaseResponse getTargetInv(String platformId) { - PlatformEntity platformEntity = platformDao.get(platformId); - if (null == platformEntity) { - return ResultVOUtils.success(); - } - String host = platformEntity.getHost(); - String url = host + "/spms/inv/warehouse/filterInv/forUdims"; - log.info("拉取自助平台仓库数据：" + url); - String resp = HttpUtil.get(url); - log.info("拉取结果：" + resp); - if (StrUtil.isNotBlank(resp) && resp.contains("20000")) { - try { - return JSON.parseObject(resp, BaseResponse.class); - } catch (Exception e) { - log.error("格式化自助平台仓库信息异常", e); - return ResultVOUtils.error(500, "调用自助平台接口异常"); - } - } else { - log.error("获取自助平台仓库失败"); - return ResultVOUtils.error(500, "调用自助平台接口异常"); - } - } - - - //获取自助平台一级仓库所属分库 - public BaseResponse getTargetSubInv(String platformId, String invCode) { - PlatformEntity platformEntity = platformDao.get(platformId); - if (null == platformEntity) { - return ResultVOUtils.success(); - } - String host = platformEntity.getHost(); - Map paramMap = new HashMap<>(); - paramMap.put("invCode", invCode); - String resp = HttpClient.mipsGet(host + "/spms/sub/inv/warehouse/getSubInvForUdims", paramMap); - if (StrUtil.isNotBlank(resp) && resp.contains("20000")) { - return JSON.parseObject(resp, BaseResponse.class); - } else { - log.error("获取自助平台分库失败"); - return ResultVOUtils.error(500, "获取自助平台接口异常"); - } - } - - /** - * 测试自助平台连通性 - * - * @param host - * @return - */ - public BaseResponse testPlatformConnection(String host) { - String testUrl = host + "/udiwms/auth/device/connect"; - String response = HttpUtil.get(testUrl); - if (StrUtil.isNotBlank(response)) { - try { - BaseResponse result = JSONUtil.toBean(response, BaseResponse.class); - if (result.getCode() == 20000) { - return ResultVOUtils.success(); - } - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } catch (Exception e) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - } else { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - } - - /** - * 根据ID查询自助平台信息 - * - * @param platformId - * @return - */ - public PlatformEntity getPlatformById(String platformId) { - return platformDao.selectById(platformId); - } - - /** - * 保存医院客户关联关系 - * - * @param unitMaintainPlatformEntity - */ - public void saveUnitPlatform(UnitMaintainPlatformEntity unitMaintainPlatformEntity) { - if (null != unitMaintainPlatformEntity.getId()) { - unitMaintainPlatformDao.updateById(unitMaintainPlatformEntity); - } else { - unitMaintainPlatformDao.insert(unitMaintainPlatformEntity); - } - - //更新当前客户关联数据的所有key - List list = unitMaintainPlatformDao.selectByCustomerId(unitMaintainPlatformEntity.getCustomerId()); - if (CollUtil.isNotEmpty(list)) { - for (UnitMaintainPlatformEntity maintainPlatform : list) { - maintainPlatform.setAppid(unitMaintainPlatformEntity.getAppid()); - maintainPlatform.setApiKey(unitMaintainPlatformEntity.getApiKey()); - maintainPlatform.setSecretKey(unitMaintainPlatformEntity.getSecretKey()); - unitMaintainPlatformDao.updateById(maintainPlatform); - } - } - - } - - @Override - public String verifyUnitMaintainPlatform(PlatformLinkRequest platformLinkRequest) { - List list = unitMaintainPlatformDao.selectList(platformLinkRequest); - if (CollUtil.isEmpty(list)) { - return "success"; - } else { - for (UnitMaintainPlatformEntity maintainPlatform : list) { - if (maintainPlatform.getId().equals(platformLinkRequest.getId())) { - return "success"; - } else { - return "重复添加"; - } - } - } - return "重复添加"; - } - - /** - * 查询关联数据 - * - * @param customerId - * @param action - * @param unitId - * @return - */ - public UnitMaintainPlatformEntity findLinkData(long customerId, String action, String unitId) { - return unitMaintainPlatformDao.findLinkData(customerId, action, unitId); - } - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java b/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java index b9e24e6c..1d2754c4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java @@ -1,9 +1,6 @@ package com.glxp.api.admin.util; -import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; import org.springframework.web.client.RestTemplate; import java.io.UnsupportedEncodingException; @@ -91,19 +88,4 @@ public class HttpClient { return restTemplate.getForObject(accessTokenRequestUrl, String.class); } - - public static String uCloudPostSmp(String url, Object object, String appKey, String secretKey) { - RestTemplate restTemplate = new RestTemplate(); - String json = JSONUtil.toJsonStr(object); - log.info(url + "\n" + json); - HttpHeaders headers = new HttpHeaders(); - headers.add("Content-Type", "application/json"); - headers.add("api_key", appKey); - headers.add("secret_key", secretKey); - HttpEntity httpEntity = new HttpEntity<>(json, headers); - log.info(httpEntity.toString()); - String response = restTemplate.postForObject(url, httpEntity, String.class); - return response; - } - } diff --git a/api-admin/src/main/resources/mybatis/mapper/info/PlatformDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/PlatformDao.xml deleted file mode 100644 index 46b57f29..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/info/PlatformDao.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - replace into auth_platform - (id, name, host) - values - - (#{item.id}, #{item.name,jdbcType=VARCHAR}, #{item.host,jdbcType=VARCHAR}) - - - - - - - - - - - - - - - insert into auth_platform(id, name, host) - VALUES (#{id}, #{name}, #{host}) - - - - - - delete - from auth_platform - where id = #{id} - - - - update auth_platform - - - name = #{name}, - - - host = #{host}, - - - where id = #{id} - - diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml deleted file mode 100644 index 8efe4521..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - update io_unit_maintain_platform - - - unitId = #{unitId}, - - - customerId = #{customerId}, - - - platformId = #{platformId}, - - - sourceAction = #{sourceAction}, - - - targetAction = #{targetAction}, - - - invCode = #{invCode}, - - - invSubCode = #{invSubCode}, - - - appid = #{appid}, - - - apiKey = #{apiKey}, - - - secretKey = #{secretKey} - - - where id = #{id} - - - - insert into io_unit_maintain_platform (unitId, customerId, platformId, sourceAction, targetAction, invCode, - invSubCode, appid, apiKey, secretKey) - VALUES (#{unitId}, #{customerId}, #{platformId}, #{sourceAction}, #{targetAction}, #{invCode}, #{invSubCode}, - #{appid}, #{apiKey}, #{secretKey}) - - - - - - - - delete from io_unit_maintain_platform where id = #{id} - - \ No newline at end of file diff --git a/api-admin/src/main/resources/schemas/schema_v2.1.sql b/api-admin/src/main/resources/schemas/schema_v2.1.sql index 1776baf4..5ee7de00 100644 --- a/api-admin/src/main/resources/schemas/schema_v2.1.sql +++ b/api-admin/src/main/resources/schemas/schema_v2.1.sql @@ -17,3 +17,8 @@ VALUES -- 创建表时必须 create table if not exists 表名 +-- 删除自助平台表 +drop table auth_platform; +-- 删除医院客户和自助平台关联表 +drop table io_unit_maintain_platform; +