From d977e8e1c70533e3a01bb645332929802e150af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 28 Jan 2026 17:04:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(admin):=20=E4=BC=98=E5=8C=96=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=89=93=E5=8C=85=E5=92=8C=E7=94=9F=E4=BA=A7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复组件打包中的启套逻辑判断 - 添加物料扫描记录的复合键支持 - 实现生产订单中仓库编号变更的批量更新 - 优化生产订单接收物料的分组逻辑 - 添加使用指南文件类型的数据库字段 - 实现使用指南按类别查询的VO转换 - 修复部署测试中的目录处理注释问题 - 优化菜单按钮和角色权限的数据查询 - 添加SAP料号重复检查验证 - 调整生产领料单模板的页面尺寸和样式 --- .../ComponentPackingController.java | 2 +- .../controller/InProduceOrderController.java | 43 +++++++++++++--- .../controller/OutAssistanceController.java | 2 +- .../controller/OutCostCenterController.java | 2 +- .../controller/OutProduceController.java | 2 +- .../controller/TransferCompanyController.java | 2 +- .../controller/TransferFactoryController.java | 2 +- .../controller/UsageGuideController.java | 11 ++-- .../resources/template/生产领料单.html | 21 ++++---- .../java/com/nflg/wms/auth/DeployTest.java | 2 +- .../pojo/document/InMaterialScanRecord.java | 7 +++ .../qo/InProduceOrderReceiveMaterialQO.java | 5 ++ .../nflg/wms/common/pojo/vo/UsageGuideVO.java | 51 +++++++++++++++++++ .../wms/repository/entity/UsageGuide.java | 5 ++ .../repository/mapper/UsageGuideMapper.java | 4 ++ .../service/IUsageGuideService.java | 4 ++ .../service/impl/RoleServiceImpl.java | 10 +++- .../service/impl/UsageGuideServiceImpl.java | 7 +++ .../service/impl/WmsMaterialServiceImpl.java | 3 ++ .../src/main/resources/mapper/MenuMapper.xml | 2 +- .../src/main/resources/mapper/RoleMapper.xml | 2 +- .../resources/mapper/UsageGuideMapper.xml | 11 ++++ .../java/com/nflg/scheduled/DeployTest.java | 2 +- 23 files changed, 167 insertions(+), 35 deletions(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/UsageGuideVO.java diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java index 39b946f4..2274d4f4 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java @@ -201,8 +201,8 @@ public class ComponentPackingController { List daVos = tasks.stream() .map(item1 -> { ComponentPackingItemPdaVO vo = Convert.convert(ComponentPackingItemPdaVO.class, item1); + vo.setQiTao(type > 0); if (Objects.equals(type, 1)) { - vo.setQiTao(true); vo.setChildren(bomService.getChildrenVO(vo.getIdnrk())); } return vo; diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java index 640f2d42..da446c5a 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java @@ -422,6 +422,7 @@ public class InProduceOrderController extends BaseController { } List materialNos = new ArrayList<>(); List records = new ArrayList<>(); + Map warehouseNoChange = new HashMap<>(); datas.forEach(it -> { InProduceOrderReceiveMaterialQO materialQO = request.getItems() .stream() @@ -433,6 +434,18 @@ public class InProduceOrderController extends BaseController { } else { VUtil.trueThrowBusinessError(it.isMustScan() && CollectionUtil.isEmpty(materialQO.getQrCodes())) .throwMessage(materialQO.getMaterialNo() + "需要提供扫码信息"); + if (!StrUtil.equals(it.getWarehouseNo(), materialQO.getWarehouseNo())) { + warehouseNoChange.put(it.getId(), materialQO.getWarehouseNo()); + it.setWarehouseNo(materialQO.getWarehouseNo()); + if (it.getParentId()>0){ + InProduceOrderItemVO pit=list.stream() + .filter(l->Objects.equals(l.getId(),it.getParentId())) + .findFirst() + .get(); + warehouseNoChange.put(pit.getId(), materialQO.getWarehouseNo()); + pit.setWarehouseNo(materialQO.getWarehouseNo()); + } + } if (it.isMustScan()) { BigDecimal num = BigDecimal.ZERO; for (String qrCode : materialQO.getQrCodes()) { @@ -490,15 +503,19 @@ public class InProduceOrderController extends BaseController { .map(InProduceOrderItemVO::getSernr) .toList(); } else { - input1 = records.stream().collect(Collectors.groupingBy(InMaterialScanRecord::getBatchNo)) - .entrySet() + input1 = records.stream().collect(Collectors.groupingBy(InMaterialScanRecord::getKey8)) + .values() .stream() - .map(kv -> new Zwm00Mb107QO() - .setPWERK(kv.getValue().get(0).getFactoryNo()) - .setPSMNG(kv.getValue().stream().map(InMaterialScanRecord::getNum).reduce(BigDecimal.ZERO, BigDecimal::add)) - .setAMEIN(kv.getValue().get(0).getUnit()) - .setLGORT(kv.getValue().get(0).getWarehouseNo()) - .setCHARG(kv.getKey())) + .map(inMaterialScanRecords -> { + InMaterialScanRecord item = inMaterialScanRecords.get(0); + return new Zwm00Mb107QO() + .setPWERK(item.getFactoryNo()) + .setPSMNG(inMaterialScanRecords.stream().map(InMaterialScanRecord::getNum).reduce(BigDecimal.ZERO, BigDecimal::add)) + .setAMEIN(item.getUnit()) + .setLGORT(item.getWarehouseNo()) + .setCHARG(item.getBatchNo()); + } + ) .toList(); sernrs = records.stream() .map(InMaterialScanRecord::getSerialNo) @@ -516,6 +533,16 @@ public class InProduceOrderController extends BaseController { ).toList() ); inMaterialScanRecordRespository.saveAll(records); + if (CollectionUtil.isNotEmpty(warehouseNoChange)) { + produceOrderItemService.updateBatchById( + warehouseNoChange.entrySet() + .stream() + .map(it -> new WmsInProduceOrderItem() + .setId(it.getKey()) + .setWarehouseNo(it.getValue()) + ).toList() + ); + } //同步入库信息到SAP Zwm00Mb107DTO dto = sapService.zwm00_mb107(order.getOrderNo(), UserUtil.getUserName(), input1, sernrs); order.setMblnr(dto.getE_MBLNR()); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java index 314d2e2e..cc28d10b 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java @@ -184,8 +184,8 @@ public class OutAssistanceController extends BaseController { .setMatnr(item.getMatnr1()) .setMeins(item.getMeins()) .setNum(item.getLeft()); + vo.setQiTao(type > 0); if (Objects.equals(type, 1)) { - vo.setQiTao(true); vo.setChildren(bomService.getChildrenVO(item.getMatnr1())); } return vo; diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java index 1635a809..f8a059aa 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java @@ -183,8 +183,8 @@ public class OutCostCenterController extends BaseController { .setMatnr(item.getMatnr()) .setNum(item.getLeft()) .setMeins(item.getMeins()); + vo.setQiTao(type > 0); if (Objects.equals(type, 1)) { - vo.setQiTao(true); vo.setChildren(bomService.getChildrenVO(item.getMatnr())); } return vo; diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java index cdc49ef3..5bde3d01 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java @@ -299,8 +299,8 @@ public class OutProduceController extends BaseController { .setMeins(item.getMeins()) .setNum(item.getSqsl().subtract(item.getNum())); Integer type = bomService.getScanType(item.getMatnr()); + vo.setQiTao(type > 0); if (Objects.equals(type, 1)) { - vo.setQiTao(true); vo.setChildren(bomService.getChildrenVO(item.getMatnr())); } return vo; diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index 9a12d92a..65beec02 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -220,8 +220,8 @@ public class TransferCompanyController extends BaseController { .setMaktx(item.getMaktx()) .setNum(item.getLeft()) .setMeins(item.getMeins()); + vo.setQiTao(type > 0); if (Objects.equals(type, 1)) { - vo.setQiTao(true); vo.setChildren(bomService.getChildrenVO(item.getMatnr())); } return vo; diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java index bbf9dc63..4a8f4ac0 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java @@ -214,8 +214,8 @@ public class TransferFactoryController extends BaseController { .setMeins(item.getMeins()) .setBinIn(StrUtil.join("/", storageService.getBinNos(item.getMatnr(), order.getWerks(), order.getUmlgo()))) .setBinOut(StrUtil.join("/", storageService.getBinNos(item.getMatnr(), order.getWerks(), order.getLgort()))); + vo.setQiTao(type > 0); if (Objects.equals(type, 1)) { - vo.setQiTao(true); vo.setChildren(bomService.getChildrenVO(item.getMatnr())); } return vo; diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UsageGuideController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UsageGuideController.java index c61e4ce2..f323177e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UsageGuideController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UsageGuideController.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.nflg.wms.common.pojo.ApiResult; +import com.nflg.wms.common.pojo.vo.UsageGuideVO; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.repository.entity.UsageGuide; import com.nflg.wms.repository.service.IUsageGuideService; @@ -36,14 +37,11 @@ public class UsageGuideController extends BaseController { /** * 文件搜索 + * @param categoryId 类别id，字典id */ @GetMapping("/getFiles") - public ApiResult> getFiles(@RequestParam Long categoryId) { - return ApiResult.success( - usageGuideService.lambdaQuery() - .eq(UsageGuide::getCategoryId, categoryId) - .list() - ); + public ApiResult> getFiles(@RequestParam(required = false) Long categoryId) { + return ApiResult.success(usageGuideService.getFiles(categoryId)); } /** @@ -61,6 +59,7 @@ public class UsageGuideController extends BaseController { .setFileName(fileName) .setFileSize(file.getSize()) .setUrl(url) + .setFileType(getFileType(file.getOriginalFilename())) .setCreateBy(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()) ); diff --git a/nflg-wms-admin/src/main/resources/template/生产领料单.html b/nflg-wms-admin/src/main/resources/template/生产领料单.html index 904e96ad..065cd2b1 100644 --- a/nflg-wms-admin/src/main/resources/template/生产领料单.html +++ b/nflg-wms-admin/src/main/resources/template/生产领料单.html @@ -18,9 +18,10 @@ } body { - /*width: 280mm;*/ - font-family: SimSun, serif; - font-size: 11pt; + width: 1425px; + height: 825px; + font-family: SimSun, monospace; + font-size: 12pt; margin: 0; } @@ -38,13 +39,13 @@ .company-name { text-align: center; - font-size: 22pt; + font-size: 23pt; margin: 10px 0; } .title { text-align: center; - font-size: 25pt; + font-size: 26pt; font-weight: bold; margin: 20px 0; } @@ -105,15 +106,15 @@ } .col-unit { - width: 30px; + width: 40px; } .col-apply { - width: 60px; + width: 70px; } .col-actual { - width: 60px; + width: 70px; } .col-warehouse { @@ -140,7 +141,7 @@ } .package-logo { - width: 280px; + width: 300px; margin: 0 auto 20px; position: absolute; } @@ -150,7 +151,7 @@ } .qrcode { - width: 140px; + width: 150px; position: absolute; right: 0; top: 0; diff --git a/nflg-wms-auth/src/test/java/com/nflg/wms/auth/DeployTest.java b/nflg-wms-auth/src/test/java/com/nflg/wms/auth/DeployTest.java index 97de61d3..4f21c91b 100644 --- a/nflg-wms-auth/src/test/java/com/nflg/wms/auth/DeployTest.java +++ b/nflg-wms-auth/src/test/java/com/nflg/wms/auth/DeployTest.java @@ -34,7 +34,7 @@ public class DeployTest { //处理主jar包 handleFile(sshUtil, localPath + jarName, remotePath + jarName); //处理lib目录 - handleDir(sshUtil, localPath, remotePath, "lib"); +// handleDir(sshUtil, localPath, remotePath, "lib"); //执行脚本启动服务 sshUtil.exec("cd " + remotePath + " && ./restart.sh"); sshUtil.disconnect(); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/InMaterialScanRecord.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/InMaterialScanRecord.java index a7f9eaab..0e75b981 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/InMaterialScanRecord.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/InMaterialScanRecord.java @@ -163,4 +163,11 @@ public class InMaterialScanRecord { public String getKey7() { return materialNo + "|" + batchNo; } + + @Transient + private String key8; + + public String getKey8() { + return batchNo + "|" + factoryNo + "|" + unit + "|" + warehouseNo; + } } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java index a4c787bf..68c5e985 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java @@ -14,6 +14,11 @@ public class InProduceOrderReceiveMaterialQO { @NotBlank private String materialNo; + /** + * 仓库编号 + */ + private String warehouseNo; + /** * 储位编号列表 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/UsageGuideVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/UsageGuideVO.java new file mode 100644 index 00000000..1df1f4e3 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/UsageGuideVO.java @@ -0,0 +1,51 @@ +package com.nflg.wms.common.pojo.vo; + +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class UsageGuideVO { + + private Long id; + + /** + * 类别id，字典id + */ + private Long categoryId; + + /** + * 类别名称 + */ + private String categoryName; + + /** + * 文件名称 + */ + private String fileName; + + /** + * 访问地址 + */ + private String url; + + /** + * 大小 + */ + private Long fileSize; + + /** + * 文件类型 + */ + private String fileType; + + /** + * 创建人 + */ + private String createBy; + + /** + * 创建时间 + */ + private LocalDateTime createTime; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/UsageGuide.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/UsageGuide.java index f2defbd0..c6349dc7 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/UsageGuide.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/UsageGuide.java @@ -60,4 +60,9 @@ public class UsageGuide implements Serializable { * 创建时间 */ private LocalDateTime createTime; + + /** + * 文件类型 + */ + private String fileType; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/UsageGuideMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/UsageGuideMapper.java index 82058157..da66b3ee 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/UsageGuideMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/UsageGuideMapper.java @@ -1,8 +1,11 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.wms.common.pojo.vo.UsageGuideVO; import com.nflg.wms.repository.entity.UsageGuide; +import java.util.List; + /** *

* Mapper 接口 @@ -13,4 +16,5 @@ import com.nflg.wms.repository.entity.UsageGuide; */ public interface UsageGuideMapper extends BaseMapper { + List getFiles(Long categoryId); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IUsageGuideService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IUsageGuideService.java index 1f893938..f74eb8de 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IUsageGuideService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IUsageGuideService.java @@ -1,8 +1,11 @@ package com.nflg.wms.repository.service; +import com.nflg.wms.common.pojo.vo.UsageGuideVO; import com.nflg.wms.repository.entity.UsageGuide; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 服务类 @@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IUsageGuideService extends IService { + List getFiles(Long categoryId); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/RoleServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/RoleServiceImpl.java index 1ef019a4..371cc6ba 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/RoleServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/RoleServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.util.Comparator; import java.util.List; import java.util.Objects; @@ -103,6 +104,7 @@ public class RoleServiceImpl extends ServiceImpl implements IR MenuVO menu = menus.get(i); bindParent(menu, menus); } + menus.sort(Comparator.comparingInt(MenuVO::getSort)); return menus; } @@ -110,7 +112,13 @@ public class RoleServiceImpl extends ServiceImpl implements IR if (!Objects.equals(0L, menu.getParentId())) { Menu mp = menuService.getById(menu.getParentId()); if (datas.stream().noneMatch(d -> Objects.equals(d.getId(), mp.getId()))) { - MenuVO m = new MenuVO().setId(mp.getId()).setName(mp.getName()).setShow(mp.getShow()).setUrl(mp.getUrl()).setComponent(mp.getComponent()).setParentId(mp.getParentId()); + MenuVO m = new MenuVO() + .setId(mp.getId()) + .setName(mp.getName()) + .setShow(mp.getShow()) + .setUrl(mp.getUrl()) + .setComponent(mp.getComponent()) + .setParentId(mp.getParentId()); datas.add(m); } } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UsageGuideServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UsageGuideServiceImpl.java index abcdbfa0..b7d44941 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UsageGuideServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UsageGuideServiceImpl.java @@ -1,11 +1,14 @@ package com.nflg.wms.repository.service.impl; +import com.nflg.wms.common.pojo.vo.UsageGuideVO; import com.nflg.wms.repository.entity.UsageGuide; import com.nflg.wms.repository.mapper.UsageGuideMapper; import com.nflg.wms.repository.service.IUsageGuideService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 服务实现类 @@ -17,4 +20,8 @@ import org.springframework.stereotype.Service; @Service public class UsageGuideServiceImpl extends ServiceImpl implements IUsageGuideService { + @Override + public List getFiles(Long categoryId) { + return baseMapper.getFiles(categoryId); + } } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsMaterialServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsMaterialServiceImpl.java index 6c558388..b2434200 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsMaterialServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsMaterialServiceImpl.java @@ -32,6 +32,9 @@ public class WmsMaterialServiceImpl extends ServiceImpl + SELECT g.*,d.name AS "category_name" + FROM usage_guide g + LEFT JOIN dictionary_item d ON g.category_id=d."id" + + + g.category_id = #{categoryId} + + + order by g.id desc + diff --git a/nflg-wms-scheduled/src/test/java/com/nflg/scheduled/DeployTest.java b/nflg-wms-scheduled/src/test/java/com/nflg/scheduled/DeployTest.java index 487a4d28..0c03838d 100644 --- a/nflg-wms-scheduled/src/test/java/com/nflg/scheduled/DeployTest.java +++ b/nflg-wms-scheduled/src/test/java/com/nflg/scheduled/DeployTest.java @@ -31,7 +31,7 @@ public class DeployTest { sshUtil.connect("192.168.163.84", 22, "root", "CMP2025nf"); //处理主jar包 handleFile(sshUtil, localPath + jarName, remotePath + jarName); -// //处理lib目录 + //处理lib目录 // handleDir(sshUtil, localPath, remotePath, "lib"); //执行脚本启动服务 sshUtil.exec("cd " + remotePath + " && ./restart.sh");