From 9eb7ffbe025e87af2bd4d6daab08a97b8bd1af08 Mon Sep 17 00:00:00 2001 From: zhangke Date: Wed, 3 Sep 2025 10:16:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BA=86=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=92=8C=E5=B9=B3=E5=8F=B0=E6=A8=A1=E5=9D=97=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CeneterOutboundControlelr.java | 108 +++++++++++++++++- .../controller/DictionaryController.java | 3 +- .../service/DepartmentControllerService.java | 16 ++- .../service/DictionaryControllerService.java | 4 + .../MultilingualControllerService.java | 3 + .../service/PositionControllerService.java | 1 + .../admin/service/RoleControllerService.java | 4 +- .../com/nflg/wms/admin/SapMetaPrintTest.java | 12 ++ nflg-wms-common/pom.xml | 6 + .../wms/common/pojo/qo/DepartmentAddQO.java | 2 +- .../nflg/wms/common/pojo/qo/LDAPAddQO.java | 7 +- .../wms/common/pojo/qo/PositionAddQO.java | 12 +- .../common/pojo/qo/SrmMaterialReceiptQO.java | 2 +- .../repository/entity/FileUploadRecord.java | 2 +- .../nflg/wms/repository/entity/KitBackup.java | 55 +++++++++ .../repository/entity/KitdetailBackup.java | 49 ++++++++ .../repository/mapper/KitBackupMapper.java | 16 +++ .../mapper/KitdetailBackupMapper.java | 16 +++ .../service/IDictionaryService.java | 3 + .../repository/service/IKitBackupService.java | 16 +++ .../service/IKitdetailBackupService.java | 16 +++ .../service/impl/DepartmentServiceImpl.java | 29 ++++- .../service/impl/DictionaryServiceImpl.java | 15 ++- .../service/impl/KitBackupServiceImpl.java | 20 ++++ .../impl/KitdetailBackupServiceImpl.java | 20 ++++ .../service/impl/RoleServiceImpl.java | 18 ++- .../main/resources/mapper/KitBackupMapper.xml | 5 + .../mapper/KitdetailBackupMapper.xml | 5 + .../resources/mapper/UserRoleMapMapper.xml | 5 +- .../wms/repository/CodeGeneratorTest.java | 2 +- 30 files changed, 431 insertions(+), 41 deletions(-) create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/KitBackup.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/KitdetailBackup.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/KitBackupMapper.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/KitdetailBackupMapper.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IKitBackupService.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IKitdetailBackupService.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/KitBackupServiceImpl.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/KitdetailBackupServiceImpl.java create mode 100644 nflg-wms-repository/src/main/resources/mapper/KitBackupMapper.xml create mode 100644 nflg-wms-repository/src/main/resources/mapper/KitdetailBackupMapper.xml diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/CeneterOutboundControlelr.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/CeneterOutboundControlelr.java index bbe5cfeb..64c89bef 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/CeneterOutboundControlelr.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/CeneterOutboundControlelr.java @@ -2,24 +2,27 @@ package com.nflg.wms.admin.controller; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.IdUtil; +import cn.hutool.json.JSONUtil; import com.nflg.wms.admin.service.CenterOutboundControllerService; import com.nflg.wms.admin.service.CenterReturnControllerService; import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; +import com.nflg.wms.common.pojo.dto.PackageMaterialDTO; import com.nflg.wms.common.pojo.qo.*; import com.nflg.wms.common.pojo.vo.*; import com.nflg.wms.common.util.PageUtil; -import com.nflg.wms.repository.entity.WmsCenterOutboundItem; -import com.nflg.wms.repository.entity.WmsCenterOutboundScan; -import com.nflg.wms.repository.entity.WmsCenterReturnItem; -import com.nflg.wms.repository.service.IWmsCenterOutboundItemService; -import com.nflg.wms.repository.service.IWmsCenterOutboundScanService; -import com.nflg.wms.repository.service.IWmsCenterOutboundService; +import com.nflg.wms.repository.entity.*; +import com.nflg.wms.repository.service.*; import com.nflg.wms.starter.annotation.ApiMark; import jakarta.annotation.Resource; import jakarta.validation.Valid; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; @@ -43,6 +46,99 @@ public class CeneterOutboundControlelr { @Resource private CenterOutboundControllerService outboundControllerService; + @Resource + private IWmsStructuralPackageService wmsStructuralPackageService; + + @Resource + private IKitBackupService kitBackupService; + + @Resource + private IKitdetailBackupService kitdetailBackupService; + + @Resource + private IWmsModelService wmsModelService; + + + @GetMapping("syncData") + public ApiResult syncData(@RequestParam String orderId) { + /** + * K001289 + * K001254 + * K001296 + * K000291 + * K000642 + * K001375 + * K001373 + * K001432 + * K001437 + * K001523 + */ + List kits = kitBackupService + .lambdaQuery() + .eq(KitBackup::getFNo, orderId) + .list(); + // List packages = new ArrayList<>(); + for (KitBackup kit : kits) { + try { + WmsStructuralPackage packageEntity = new WmsStructuralPackage(); + packageEntity.setId(IdUtil.getSnowflakeNextId()); + packageEntity.setNo(kit.getPNo()); + packageEntity.setOrderNo(kit.getFNo()); + packageEntity.setName(kit.getPName()); + packageEntity.setDrawingNo(kit.getDNo()); + packageEntity.setVersion(kit.getVNo()); + packageEntity.setWeight(kit.getWeight()); + packageEntity.setCate(kit.getKClass()); + packageEntity.setCreateTime(kit.getCDatee()); + packageEntity.setCreateBy("系统导入"); + packageEntity.setEco(kit.getEco()); + packageEntity.setRemark(kit.getRemark()); + packageEntity.setEnable(false); + String[] modelIds = kit.getSpec().split(","); + List models = wmsModelService.lambdaQuery().in(WmsModel::getNo, modelIds).list(); + if (CollectionUtil.isNotEmpty(models)) { + List lIds = new ArrayList<>(); + lIds.addAll(models.stream().map(WmsModel::getId).toList()); + String result = String.join(",", lIds.stream().map(String::valueOf).toArray(String[]::new)); + packageEntity.setModelIds(String.join(",", result)); + } + List details = kitdetailBackupService.lambdaQuery() + .eq(KitdetailBackup::getFNo, kit.getFNo()) + .list(); + if (CollectionUtil.isNotEmpty(details)) { + List materials = new ArrayList<>(); + for (KitdetailBackup detail : details) { + if (detail.getMPartNo().equals("")) + continue; + ; + PackageMaterialDTO materialDTO = new PackageMaterialDTO(); + materialDTO.setNo(detail.getMPartNo()); + materialDTO.setName(detail.getMPartName()); + materialDTO.setDrawingNo(detail.getDNo()); + materialDTO.setStation(detail.getWorkstation()); + materialDTO.setTray(detail.getPalletItem()); + materialDTO.setNum(new BigDecimal(detail.getKeQty())); + materialDTO.setWeight(new BigDecimal(detail.getKeWeight().equals("") ? "0" : detail.getKeWeight())) + ; + materialDTO.setVersion(Integer.valueOf(detail.getDVer())); + materialDTO.setImage(""); + materialDTO.setCreateBy("系统导入"); + materialDTO.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + materials.add(materialDTO); + } + packageEntity.setMaterials(JSONUtil.toJsonStr(materials)); + } + + wmsStructuralPackageService.save(packageEntity); + //packages.add(packageEntity); + } catch (Exception e) { + continue; + } + } + //wmsStructuralPackageService.saveBatch(packages); + return ApiResult.success(); + } + /** * 查询领料单列表 * diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/DictionaryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/DictionaryController.java index fe019b99..dbb3a151 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/DictionaryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/DictionaryController.java @@ -104,7 +104,8 @@ public class DictionaryController extends BaseController { @PostMapping("deleteDictionaryItem") @ApiMark(moduleName = "字典管理", apiName = "删除字典值") public ApiResult deleteDictionaryItem(@Valid @RequestBody @NotEmpty List ids) { - dictionaryItemService.removeByIds(ids); + dictionaryControllerService.deleteDictionaryItems(ids); + //dictionaryItemService.removeByIds(ids); return ApiResult.success(); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DepartmentControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DepartmentControllerService.java index b14dc4f0..c2e2302b 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DepartmentControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DepartmentControllerService.java @@ -43,11 +43,11 @@ public class DepartmentControllerService { @Resource private IAdService adService; - public void add(DepartmentAddQO request){ + public void add(DepartmentAddQO request) { VUtil.trueThrowBusinessError(deptService.lambdaQuery() - .eq(Department::getParentId, request.getParentId()) - .eq(Department::getName, request.getName()) - .exists()) + .eq(Department::getParentId, request.getParentId()) + .eq(Department::getName, request.getName()) + .exists()) .throwMessage("部门已存在"); deptService.add(request); } @@ -69,13 +69,11 @@ public class DepartmentControllerService { Department department = deptService.getById(id); VUtil.trueThrowBusinessError(Objects.equals(department.getSource(), 1)).throwMessage("不能删除从AD域同步的部门信息"); VUtil.trueThrowBusinessError(deptService.lambdaQuery() - .eq(Department::getParentId, id) - .exists()) - .throwMessage("删除失败，该部门存在下级部门"); + .eq(Department::getParentId, id) + .exists()) .throwMessage("删除失败，该部门存在下级部门"); VUtil.trueThrowBusinessError(userInteriorService.lambdaQuery() .eq(UserInterior::getDeptId, id) - .exists()) - .throwMessage("删除失败，该部门绑定了用户"); + .exists()).throwMessage("删除失败，该部门绑定了用户"); deptService.delete(id); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DictionaryControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DictionaryControllerService.java index 96314bf2..5452fb18 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DictionaryControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DictionaryControllerService.java @@ -176,4 +176,8 @@ public class DictionaryControllerService { public List getListByDictionaryCode(@Valid @RequestParam @NotBlank String dictionaryCode) { return dictionaryItemService.getListByDictionaryCode(dictionaryCode); } + + public void deleteDictionaryItems(@Valid @NotEmpty List ids) { + dictionaryService.deleteItems(ids); + } } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MultilingualControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MultilingualControllerService.java index add2270b..2b4d3f6a 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MultilingualControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MultilingualControllerService.java @@ -35,6 +35,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.File; @@ -84,8 +85,10 @@ public class MultilingualControllerService { return webComponentService.search(request); } + @Transactional public void deleteWebComponent(@Valid @NotEmpty List ids) { webComponentService.removeByIds(ids); + webComponentTranslateService.remove(new LambdaQueryWrapper().in(WebComponentTranslate::getComponentId, ids)); } public void exportWebComponentTranslates(HttpServletResponse response, @Valid WebComponentSearchQO request) throws IOException { diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/PositionControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/PositionControllerService.java index 381579ec..e2e263d6 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/PositionControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/PositionControllerService.java @@ -59,6 +59,7 @@ public class PositionControllerService { .throwMessage("职位已存在"); positionService.updateById(new Position() .setId(request.getId()) + .setCode(StringUtil.toPinYin(request.getName())) .setName(request.getName()) .setEnable(request.getEnable()) .setRemark(request.getRemark()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/RoleControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/RoleControllerService.java index 60025795..2faec3c9 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/RoleControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/RoleControllerService.java @@ -43,9 +43,7 @@ public class RoleControllerService { } public void updateRole(RoleUpdateQO request) { - if (StrUtil.isBlank(request.getCode())){ - request.setCode(toPinYin(request.getName())); - } + request.setCode(toPinYin(request.getName())); roleService.update(request, UserUtil.getUserName()); } diff --git a/nflg-wms-admin/src/test/java/com/nflg/wms/admin/SapMetaPrintTest.java b/nflg-wms-admin/src/test/java/com/nflg/wms/admin/SapMetaPrintTest.java index 8df46b4b..07b42d56 100644 --- a/nflg-wms-admin/src/test/java/com/nflg/wms/admin/SapMetaPrintTest.java +++ b/nflg-wms-admin/src/test/java/com/nflg/wms/admin/SapMetaPrintTest.java @@ -165,6 +165,18 @@ public class SapMetaPrintTest { } + @Test + public void ZWM3A19() throws JCoException { + printMeta("ZWM3A19"); + } + + + @Test + public void ZWM3A20() throws JCoException { + printMeta("ZWM3A20"); + } + + public void printMeta(String functionName) throws JCoException { functionName = functionName.toUpperCase(); JCoFunction function = repository.getFunction(functionName); diff --git a/nflg-wms-common/pom.xml b/nflg-wms-common/pom.xml index 95958bdb..529035b9 100644 --- a/nflg-wms-common/pom.xml +++ b/nflg-wms-common/pom.xml @@ -62,6 +62,12 @@ 2.0.3 compile + + + + + + diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DepartmentAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DepartmentAddQO.java index 63857ad9..19c9b07a 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DepartmentAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DepartmentAddQO.java @@ -28,5 +28,5 @@ public class DepartmentAddQO { /** * 是否启用 */ - private Boolean enable = true; + private Boolean enable; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/LDAPAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/LDAPAddQO.java index d017bbe8..8f17505a 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/LDAPAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/LDAPAddQO.java @@ -1,6 +1,7 @@ package com.nflg.wms.common.pojo.qo; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; @Data @@ -21,13 +22,13 @@ public class LDAPAddQO { /** * 服务器端口 */ - @NotBlank + @NotNull private Integer port; /** * 超时时间，单位秒 */ - @NotBlank + @NotNull private Short timeout; /** @@ -45,7 +46,7 @@ public class LDAPAddQO { /** * 是否启用 */ - @NotBlank + @NotNull private Boolean enable; /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PositionAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PositionAddQO.java index b0be3ee4..1ed3043f 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PositionAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PositionAddQO.java @@ -1,10 +1,20 @@ package com.nflg.wms.common.pojo.qo; +import jakarta.validation.constraints.NotBlank; import lombok.Data; @Data -public class PositionAddQO extends DepartmentAddQO { +public class PositionAddQO { + /** + * 名称 + */ + @NotBlank + private String name; + /** + * 是否启用 + */ + private Boolean enable = true; /** * 备注 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java index 0986ca06..fe1e3fdd 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java @@ -13,7 +13,7 @@ import java.util.List; @Data public class SrmMaterialReceiptQO { - /* + /** * 送货单行ID */ private Long id; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/FileUploadRecord.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/FileUploadRecord.java index d3eb4534..426b299a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/FileUploadRecord.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/FileUploadRecord.java @@ -57,7 +57,7 @@ public class FileUploadRecord implements Serializable { /** * 来源 */ - @TableField(value="`from`") + @TableField(value="\"from\"") private String from; /** diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/KitBackup.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/KitBackup.java new file mode 100644 index 00000000..585aa62e --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/KitBackup.java @@ -0,0 +1,55 @@ +package com.nflg.wms.repository.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("kit_backup") +public class KitBackup implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; + + private String fNo; + + private String pNo; + + private String spec; + + private BigDecimal vNo; + + private String kClass; + + private BigDecimal weight; + + private String cId; + + private LocalDateTime cDatee; + + private String pName; + + private String dNo; + + private String eco; + + private String remark; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/KitdetailBackup.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/KitdetailBackup.java new file mode 100644 index 00000000..1902b25c --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/KitdetailBackup.java @@ -0,0 +1,49 @@ +package com.nflg.wms.repository.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("kitdetail_backup") +public class KitdetailBackup implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; + + private String fNo; + + private String fPartNo; + + private String mPartNo; + + private String keQty; + + private String keWeight; + + private String workstation; + + private String palletItem; + + private String dVer; + + private String mPartName; + + private String dNo; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/KitBackupMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/KitBackupMapper.java new file mode 100644 index 00000000..33b5d3e2 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/KitBackupMapper.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.wms.repository.entity.KitBackup; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface KitBackupMapper extends BaseMapper { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/KitdetailBackupMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/KitdetailBackupMapper.java new file mode 100644 index 00000000..a03d0a14 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/KitdetailBackupMapper.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.wms.repository.entity.KitdetailBackup; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface KitdetailBackupMapper extends BaseMapper { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IDictionaryService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IDictionaryService.java index 815ccb41..d664c5ed 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IDictionaryService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IDictionaryService.java @@ -7,6 +7,7 @@ import com.nflg.wms.common.pojo.qo.DictionarySearchQO; import com.nflg.wms.common.pojo.qo.SaveDictionaryQO; import com.nflg.wms.repository.entity.Dictionary; import com.nflg.wms.repository.entity.DictionaryItem; +import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; @@ -31,4 +32,6 @@ public interface IDictionaryService extends IService { List getAllLanguageByDictionaryItemIds(@NotEmpty List dictionaryItemIds); DictionaryItem getItemByCode(String code, @NotBlank String itemCode); + + void deleteItems(@Valid @NotEmpty List ids); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IKitBackupService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IKitBackupService.java new file mode 100644 index 00000000..8a53d1c0 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IKitBackupService.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.service; + +import com.nflg.wms.repository.entity.KitBackup; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface IKitBackupService extends IService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IKitdetailBackupService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IKitdetailBackupService.java new file mode 100644 index 00000000..52b18162 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IKitdetailBackupService.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.service; + +import com.nflg.wms.repository.entity.KitdetailBackup; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface IKitdetailBackupService extends IService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java index e7db8900..3ab92b73 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java @@ -3,6 +3,7 @@ package com.nflg.wms.repository.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.qo.DepartmentAddQO; @@ -48,17 +49,18 @@ public class DepartmentServiceImpl extends ServiceImpl search(DepartmentSearchQO request) { - if (StrUtil.isBlank(request.getName()) && StrUtil.isBlank(request.getNo())) { + if (StrUtil.isBlank(request.getName()) && StrUtil.isBlank(request.getNo()) + ) { return getPage(request.getPage(), request.getPageSize()); } else { return searchByKey(request); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DictionaryServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DictionaryServiceImpl.java index 638eb786..4cc5f742 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DictionaryServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DictionaryServiceImpl.java @@ -86,12 +86,12 @@ public class DictionaryServiceImpl extends ServiceImpl ids) { - removeByIds(ids); - List itemIds = dictionaryItemService.lambdaQuery().eq(DictionaryItem::getDictionaryId, ids).list().stream().map(DictionaryItem::getId).collect(Collectors.toList()); + List itemIds = dictionaryItemService.lambdaQuery().in(DictionaryItem::getDictionaryId, ids).list().stream().map(DictionaryItem::getId).collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(itemIds)) { dictionaryItemService.removeByIds(itemIds); dictionaryItemTranslateService.remove(new LambdaQueryWrapper().in(DictionaryItemTranslate::getDictionaryItemId, itemIds)); } + removeByIds(ids); } @Override @@ -124,4 +124,15 @@ public class DictionaryServiceImpl extends ServiceImpl ids) { + List itemIds = dictionaryItemService.lambdaQuery().in(DictionaryItem::getId, ids).list().stream().map(DictionaryItem::getId).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(itemIds)) { + dictionaryItemService.removeByIds(itemIds); + dictionaryItemTranslateService.remove(new LambdaQueryWrapper().in(DictionaryItemTranslate::getDictionaryItemId, itemIds)); + } + } } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/KitBackupServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/KitBackupServiceImpl.java new file mode 100644 index 00000000..1d9c67f5 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/KitBackupServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.wms.repository.service.impl; + +import com.nflg.wms.repository.entity.KitBackup; +import com.nflg.wms.repository.mapper.KitBackupMapper; +import com.nflg.wms.repository.service.IKitBackupService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class KitBackupServiceImpl extends ServiceImpl implements IKitBackupService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/KitdetailBackupServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/KitdetailBackupServiceImpl.java new file mode 100644 index 00000000..d450c88f --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/KitdetailBackupServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.wms.repository.service.impl; + +import com.nflg.wms.repository.entity.KitdetailBackup; +import com.nflg.wms.repository.mapper.KitdetailBackupMapper; +import com.nflg.wms.repository.service.IKitdetailBackupService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class KitdetailBackupServiceImpl extends ServiceImpl implements IKitdetailBackupService { + +} 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 349c2b98..1ef019a4 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 @@ -60,10 +60,13 @@ public class RoleServiceImpl extends ServiceImpl implements IR public void update(RoleUpdateQO request, String userName) { Role role1 = getById(request.getId()); VUtil.trueThrowBusinessError(Objects.isNull(role1)).throwMessage("角色不存在"); - Role role2 = BeanUtil.copy(role1, Role.class); - role2.setCode(request.getCode()) + Role role2 = new Role() + .setId(request.getId()) + .setCode(request.getCode()) .setName(request.getName()) .setEnable(request.getEnable()) + .setCreateBy(role1.getCreateBy()) + .setCreateTime(role1.getCreateTime()) .setUpdateBy(userName) .setUpdateTime(LocalDateTime.now()); updateById(role2); @@ -80,8 +83,13 @@ public class RoleServiceImpl extends ServiceImpl implements IR public void enable(EnableQO request, String userName) { Role role1 = getById(request.getId()); VUtil.trueThrowBusinessError(Objects.isNull(role1)).throwMessage("角色不存在"); - Role role2 = BeanUtil.copy(role1, Role.class); - role2.setEnable(request.getEnable()) + Role role2 = new Role() + .setId(request.getId()) + .setCode(role1.getCode()) + .setName(role1.getName()) + .setEnable(request.getEnable()) + .setCreateBy(role1.getCreateBy()) + .setCreateTime(role1.getCreateTime()) .setUpdateBy(userName) .setUpdateTime(LocalDateTime.now()); updateById(role2); @@ -90,7 +98,7 @@ public class RoleServiceImpl extends ServiceImpl implements IR @Override public List getMenusByRoleCodes(Long serviceId, Long userId) { - List menus=baseMapper.getMenusByRoleCodes(serviceId,userId); + List menus = baseMapper.getMenusByRoleCodes(serviceId, userId); for (int i = 0; i < menus.size(); i++) { MenuVO menu = menus.get(i); bindParent(menu, menus); diff --git a/nflg-wms-repository/src/main/resources/mapper/KitBackupMapper.xml b/nflg-wms-repository/src/main/resources/mapper/KitBackupMapper.xml new file mode 100644 index 00000000..1be6a67c --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/KitBackupMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/main/resources/mapper/KitdetailBackupMapper.xml b/nflg-wms-repository/src/main/resources/mapper/KitdetailBackupMapper.xml new file mode 100644 index 00000000..e88ba7a6 --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/KitdetailBackupMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml b/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml index 0eeab3b1..c88374cb 100644 --- a/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml @@ -10,7 +10,10 @@