From 5181105c74473ef3cdeea5ee852af37ce8bc79f4 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 15 Jan 2025 19:21:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=BA=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91=EF=BC=8Cnacos=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/base/api/domain/MaMachine.java | 2 + .../main/resources/bootstrap-sgzb_cq_dev.yml | 8 +- .../main/resources/bootstrap-sgzb_cq_dev.yml | 10 +- .../SecondaryWarehouseController.java | 19 +- .../mapper/SecondaryWarehouseMapper.java | 2 + .../service/SecondaryWarehouseService.java | 2 + .../impl/SecondaryWarehouseServiceImpl.java | 5 + .../main/resources/bootstrap-sgzb_cq_dev.yml | 8 +- .../material/SecondaryWarehouseMapper.xml | 239 ++++++++++++++---- .../main/resources/bootstrap-sgzb_cq_dev.yml | 8 +- 10 files changed, 234 insertions(+), 69 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java index 61dad58..2c4def0 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java @@ -74,6 +74,7 @@ public class MaMachine extends BaseEntity { private String typeName; private String manageType; private String nuitName; + private String groupName; private Integer receiveNum; private String maIds; private Integer id; @@ -251,6 +252,7 @@ public class MaMachine extends BaseEntity { * 退料工程 */ private String backPro; + private String name; /** * 退料时间 */ diff --git a/sgzb-auth/src/main/resources/bootstrap-sgzb_cq_dev.yml b/sgzb-auth/src/main/resources/bootstrap-sgzb_cq_dev.yml index 10c3cfc..18f2fa6 100644 --- a/sgzb-auth/src/main/resources/bootstrap-sgzb_cq_dev.yml +++ b/sgzb-auth/src/main/resources/bootstrap-sgzb_cq_dev.yml @@ -4,17 +4,21 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.56:8848 + server-addr: 192.168.0.16:18848 namespace: sgzb_cqjj + username: nacos + password: nacos config: # 配置中心地址 - server-addr: 192.168.0.56:8848 + server-addr: 192.168.0.16:18848 namespace: sgzb_cqjj # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + username: nacos + password: nacos onlineApprove: /lbcloud-oauth/oauth/token wechatAppId: crhmaxnE diff --git a/sgzb-gateway/src/main/resources/bootstrap-sgzb_cq_dev.yml b/sgzb-gateway/src/main/resources/bootstrap-sgzb_cq_dev.yml index e0e986b..17a9398 100644 --- a/sgzb-gateway/src/main/resources/bootstrap-sgzb_cq_dev.yml +++ b/sgzb-gateway/src/main/resources/bootstrap-sgzb_cq_dev.yml @@ -17,17 +17,21 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.56:8848 + server-addr: 192.168.0.16:18848 namespace: sgzb_cqjj + username: nacos + password: nacos config: # 配置中心地址 - server-addr: 192.168.0.56:8848 + server-addr: 192.168.0.16:18848 namespace: sgzb_cqjj # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + username: nacos + password: nacos sentinel: # 取消控制台懒加载 eager: true @@ -38,7 +42,7 @@ spring: datasource: ds1: nacos: - server-addr: 192.168.0.56:8848 + server-addr: 192.168.0.16:18848 dataId: sentinel-sgzb-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java index 7b17a7b..eb60468 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java @@ -62,6 +62,7 @@ public class SecondaryWarehouseController extends BaseController { List list = service.listTeamGroup(bean); return AjaxResult.success(getDataTable(list)); } + @ApiOperation(value = "新增班组") @PostMapping("/addTeamGroup") public AjaxResult addTeamGroup(@RequestBody TeamGroup bean) { @@ -78,6 +79,7 @@ public class SecondaryWarehouseController extends BaseController { List list = service.getList(bean); return getDataTable(list); } + @ApiOperation(value = "获取二级库（在用、在库）编码机具") @GetMapping("/getMaStatusByMaId") public TableDataInfo getMaStatusByMaId(SecondaryWarehouse bean) { @@ -85,11 +87,18 @@ public class SecondaryWarehouseController extends BaseController { List list = service.getMaStatusByMaId(bean); return getDataTable(list); } - /* @ApiOperation(value = "获取二级库（在用、在库）数量机具") - @GetMapping("/getDevCount") - public Integer getDevCount(SecondaryWarehouse bean) { - return service.getDevCount(bean); - }*/ + + /* @ApiOperation(value = "获取二级库（在用、在库）数量机具") + @GetMapping("/getDevCount") + public Integer getDevCount(SecondaryWarehouse bean) { + return service.getDevCount(bean); + }*/ + @ApiOperation(value = "班组库存台账") + @GetMapping("/getDevStockCount") + public TableDataInfo getDevStockCount(SecondaryWarehouse bean) { + startPage(); + return getDataTable(service.getDevStockCount(bean)); + } /** * 二级库导出 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java index f177e65..7ffd631 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java @@ -77,4 +77,6 @@ public interface SecondaryWarehouseMapper { Integer deleteOutNum(TeamLeaseInfo teamLeaseInfo); Integer selectParentId(TeamLeaseInfo teamLeaseInfo); + + List getDevStockCount(SecondaryWarehouse bean); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SecondaryWarehouseService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SecondaryWarehouseService.java index 0d64014..f3ab9ba 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SecondaryWarehouseService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SecondaryWarehouseService.java @@ -40,4 +40,6 @@ public interface SecondaryWarehouseService { List getMaStatusByMaId(SecondaryWarehouse bean); Integer getDevCount(SecondaryWarehouse bean); + + List getDevStockCount(SecondaryWarehouse bean); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java index 3f6bd54..92f37b5 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java @@ -147,6 +147,11 @@ public class SecondaryWarehouseServiceImpl implements SecondaryWarehouseService return mapper.getDevCount(bean); } + @Override + public List getDevStockCount(SecondaryWarehouse bean) { + return mapper.getDevStockCount(bean); + } + @Override public List getList(SecondaryWarehouse bean) { bean.setLeaseType(1); diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cq_dev.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cq_dev.yml index d1d05df..62d9385 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cq_dev.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cq_dev.yml @@ -15,17 +15,21 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.56:8848 + server-addr: 192.168.0.16:18848 namespace: sgzb_cqjj + username: nacos + password: nacos config: # 配置中心地址 - server-addr: 192.168.0.56:8848 + server-addr: 192.168.0.16:18848 namespace: sgzb_cqjj # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + username: nacos + password: nacos # 多站点特殊配置 sgzb: diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml index 5f1c63d..c4bb6ea 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml @@ -388,63 +388,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ma_id = #{maId} + insert into second_lot_config (name,unit_id,creater,create_time) diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_cq_dev.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_cq_dev.yml index b28d1b0..84ddbbf 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_cq_dev.yml +++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_cq_dev.yml @@ -15,17 +15,21 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.56:8848 + server-addr: 192.168.0.16:18848 namespace: sgzb_cqjj + username: nacos + password: nacos config: # 配置中心地址 - server-addr: 192.168.0.56:8848 + server-addr: 192.168.0.16:18848 namespace: sgzb_cqjj # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + username: nacos + password: nacos #腾讯云sms tencent: sms: From dff24e2c4dceea352beae8470822368e5349e12d Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 16 Jan 2025 11:14:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/material/controller/SecondaryWarehouseController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java index eb60468..fd662b9 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java @@ -107,6 +107,7 @@ public class SecondaryWarehouseController extends BaseController { @PostMapping("/exportList") public void exportList(HttpServletResponse response, @RequestBody SecondaryWarehouse bean) { if (bean.getLeaseType().equals(0)) { + SecondaryWarehouseVo bean1 = new SecondaryWarehouseVo(); BeanUtils.copyProperties(bean, bean1); List list = service.getList1(bean1);