From 08a8929829d439e29d164c53d15b8585bb3b9ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Tue, 13 Jan 2026 17:51:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A0=87=E8=AF=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MaterialInfomationApi.java | 2 +- .../admin/base/MaterialDestroyController.java | 10 +++++----- .../controller/admin/base/TaxController.java | 9 +++++++++ .../controller/admin/base/vo/TaxStsVO.java | 12 ++++++++++++ .../module/base/service/base/TaxService.java | 3 +++ .../base/service/base/TaxServiceImpl.java | 13 +++++++++++++ .../admin/erp/ErpMaterialController.java | 18 ++++++++++-------- .../admin/erp/vo/MaterialInfomationApiVO.java | 13 +++++++++++++ .../erp/dal/dataobject/erp/ErpMaterialDO.java | 3 +++ .../service/erp/ErpMaterialServiceImpl.java | 2 +- 10 files changed, 70 insertions(+), 15 deletions(-) create mode 100644 zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/TaxStsVO.java create mode 100644 zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/MaterialInfomationApiVO.java diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/api/materialinfomation/MaterialInfomationApi.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/api/materialinfomation/MaterialInfomationApi.java index bc52c661..be5ff409 100644 --- a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/api/materialinfomation/MaterialInfomationApi.java +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/api/materialinfomation/MaterialInfomationApi.java @@ -53,7 +53,7 @@ public interface MaterialInfomationApi { @Operation(summary = "按 ID 批量获得物料信息") CommonResult> getMaterialInfomationListByIds(@RequestParam("ids") List ids); - @GetMapping(PREFIX + "/page") + @PostMapping(PREFIX + "/page") @Operation(summary = "获得物料信息分页") CommonResult> getMaterialInfomationPage(@Valid MaterialInfomationPageReqDTO pageReqDTO); diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialDestroyController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialDestroyController.java index f6b2c7d3..cdd25abf 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialDestroyController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialDestroyController.java @@ -40,14 +40,14 @@ public class MaterialDestroyController { @PostMapping("/create") @Operation(summary = "创建物料回收率") - @PreAuthorize("@ss.hasPermission('base:material-destroy:create')") + //@PreAuthorize("@ss.hasPermission('base:material-destroy:create')") public CommonResult createMaterialDestroy(@Valid @RequestBody MaterialDestroySaveReqVO createReqVO) { return success(materialDestroyService.createMaterialDestroy(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新物料回收率") - @PreAuthorize("@ss.hasPermission('base:material-destroy:update')") + //@PreAuthorize("@ss.hasPermission('base:material-destroy:update')") public CommonResult updateMaterialDestroy(@Valid @RequestBody MaterialDestroySaveReqVO updateReqVO) { materialDestroyService.updateMaterialDestroy(updateReqVO); return success(true); @@ -56,7 +56,7 @@ public class MaterialDestroyController { @DeleteMapping("/delete") @Operation(summary = "删除物料回收率") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('base:material-destroy:delete')") + //@PreAuthorize("@ss.hasPermission('base:material-destroy:delete')") public CommonResult deleteMaterialDestroy(@RequestParam("id") Long id) { materialDestroyService.deleteMaterialDestroy(id); return success(true); @@ -65,7 +65,7 @@ public class MaterialDestroyController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除物料回收率") - @PreAuthorize("@ss.hasPermission('base:material-destroy:delete')") + // @PreAuthorize("@ss.hasPermission('base:material-destroy:delete')") public CommonResult deleteMaterialDestroyList(@RequestBody BatchDeleteReqVO req) { materialDestroyService.deleteMaterialDestroyListByIds(req.getIds()); return success(true); @@ -103,7 +103,7 @@ public class MaterialDestroyController { @PutMapping("/enable-list") @Operation(summary = "批量更新") - @PreAuthorize("@ss.hasPermission('base:material-destroy:update')") + // @PreAuthorize("@ss.hasPermission('base:material-destroy:update')") public CommonResult enableMaterialDestroyList(@RequestBody List saveReqVOS) { materialDestroyService.enableMaterialDestroyList(saveReqVOS); return success(true); diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/TaxController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/TaxController.java index 7ada53e7..79510f57 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/TaxController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/TaxController.java @@ -11,6 +11,7 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils; import com.zt.plat.module.base.controller.admin.base.vo.TaxPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.TaxRespVO; import com.zt.plat.module.base.controller.admin.base.vo.TaxSaveReqVO; +import com.zt.plat.module.base.controller.admin.base.vo.TaxStsVO; import com.zt.plat.module.base.dal.dataobject.base.TaxDO; import com.zt.plat.module.base.service.base.TaxService; import io.swagger.v3.oas.annotations.Operation; @@ -101,5 +102,13 @@ public class TaxController implements BusinessControllerMarker { ExcelUtils.write(response, "税码信息.xls", "数据", TaxRespVO.class, BeanUtils.toBean(list, TaxRespVO.class)); } + //启用和禁用 + @PostMapping("/enable-list") + @Operation(summary = "启用禁用税码信息") + //@PreAuthorize("@ss.hasPermission('base:tax:update')") + public CommonResult enableTaxList(@Validated @RequestBody List req) { + taxService.enableTaxList(req); + return success(true); + } } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/TaxStsVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/TaxStsVO.java new file mode 100644 index 00000000..7c8784b6 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/TaxStsVO.java @@ -0,0 +1,12 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "税码状态更新") +public class TaxStsVO { + private String id; + @Schema(description = "是否启用") + private String isEnable; +} diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/TaxService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/TaxService.java index eabf8f51..0c40a7c2 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/TaxService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/TaxService.java @@ -4,6 +4,7 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.module.base.controller.admin.base.vo.TaxPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.TaxRespVO; import com.zt.plat.module.base.controller.admin.base.vo.TaxSaveReqVO; +import com.zt.plat.module.base.controller.admin.base.vo.TaxStsVO; import com.zt.plat.module.base.dal.dataobject.base.TaxDO; import jakarta.validation.Valid; @@ -61,4 +62,6 @@ public interface TaxService { */ PageResult getTaxPage(TaxPageReqVO pageReqVO); + void enableTaxList(List req); + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/TaxServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/TaxServiceImpl.java index 09f5c031..8bc4cac1 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/TaxServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/TaxServiceImpl.java @@ -6,10 +6,12 @@ import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.module.base.controller.admin.base.vo.TaxPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.TaxRespVO; import com.zt.plat.module.base.controller.admin.base.vo.TaxSaveReqVO; +import com.zt.plat.module.base.controller.admin.base.vo.TaxStsVO; import com.zt.plat.module.base.dal.dataobject.base.TaxDO; import com.zt.plat.module.base.dal.mysql.base.TaxMapper; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import java.util.List; @@ -86,4 +88,15 @@ public class TaxServiceImpl implements TaxService { return taxMapper.selectPage(pageReqVO); } + @Override + @Transactional(rollbackFor = Exception.class) + public void enableTaxList(List req) { + req.forEach(item -> { + TaxDO tax = new TaxDO(); + tax.setId(Long.valueOf(item.getId())); + tax.setIsEnable(item.getIsEnable()); + taxMapper.updateById(tax); + }); + } + } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpMaterialController.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpMaterialController.java index 229c137a..27cc7a5d 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpMaterialController.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpMaterialController.java @@ -8,10 +8,7 @@ import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.framework.excel.core.util.ExcelUtils; import com.zt.plat.module.base.api.materialinfomation.dto.MaterialInfomationPageReqDTO; -import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialCorrSaveReqVO; -import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialPageReqVO; -import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialRespVO; -import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialSaveReqVO; +import com.zt.plat.module.erp.controller.admin.erp.vo.*; import com.zt.plat.module.erp.dal.dataobject.erp.ErpMaterialDO; import com.zt.plat.module.erp.service.erp.ErpMaterialService; import io.swagger.v3.oas.annotations.Operation; @@ -155,10 +152,15 @@ public class ErpMaterialController { } //查询物料 - @GetMapping("/api-erp-material") + @PostMapping("/api-erp-material") @Operation(summary = "通过接口查询物料") @PreAuthorize("@ss.hasPermission('sply:erp-material:query')") - public CommonResult> getErpMaterialByApi(@RequestBody MaterialInfomationPageReqDTO material) { + public CommonResult> getErpMaterialByApi(@RequestBody MaterialInfomationApiVO vo) { + MaterialInfomationPageReqDTO material = new MaterialInfomationPageReqDTO(); + material.setCode(vo.getMaterialNumber()); + material.setName(vo.getMaterialName()); + material.setPageSize(vo.getPageSize()); + material.setPageNo(vo.getPageNo()); List erpMaterial = erpMaterialService.getErpMaterialByApi(material); return success(BeanUtils.toBean(erpMaterial, ErpMaterialRespVO.class)); } @@ -168,7 +170,7 @@ public class ErpMaterialController { @GetMapping("/erpMaterial-mainMaterial-code") @Operation(summary = "通过主物料编号查询子物料信息") @PreAuthorize("@ss.hasPermission('sply:erp-material:query')") - public CommonResult getErpMaterialByMainMaterialByCode(String code) { + public CommonResult getErpMaterialByMainMaterialByCode(@RequestParam("materialNumber") String code) { return success(BeanUtils.toBean(erpMaterialService.getErpMaterialByMainMaterialByCode(code), ErpMaterialRespVO.class)); } @@ -176,7 +178,7 @@ public class ErpMaterialController { @GetMapping("/api-erp-material-code") @Operation(summary = "通过编号接口查询物料") @PreAuthorize("@ss.hasPermission('sply:erp-material:query')") - public CommonResult> getErpMaterialByApiByCode(String code) { + public CommonResult> getErpMaterialByApiByCode(@RequestParam("materialNumber")String code) { return success(BeanUtils.toBean(erpMaterialService.getErpMaterialByApiByCode(code), ErpMaterialRespVO.class)); } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/MaterialInfomationApiVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/MaterialInfomationApiVO.java new file mode 100644 index 00000000..aeec7626 --- /dev/null +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/MaterialInfomationApiVO.java @@ -0,0 +1,13 @@ +package com.zt.plat.module.erp.controller.admin.erp.vo; + +import com.zt.plat.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class MaterialInfomationApiVO extends PageParam { + @Schema(description = "物料编号") + private String materialNumber; + @Schema(description = "物料名称") + private String materialName; +} diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpMaterialDO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpMaterialDO.java index 84926cef..b885552a 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpMaterialDO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpMaterialDO.java @@ -126,4 +126,7 @@ public class ErpMaterialDO extends BusinessBaseDO { @TableField("DEC") private Long decimalValue; + @TableField(exist = false) + private String materialNumber; + } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java index 0325980f..df748aac 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java @@ -221,6 +221,7 @@ public class ErpMaterialServiceImpl implements ErpMaterialService { MaterialInfomationRespDTO data = materialInfomation.getData(); MaterialAttributeUtils.MaterialAttribute materialAttribute = MaterialAttributeUtils.safeExtractAllAttributes(data); // 有对应关系的字段赋值 + erpMaterialDO.setMaterialNumber(data.getCode());//物料编码 erpMaterialDO.setId(data.getId()); // 主键 erpMaterialDO.setMaterialName(data.getName()); // 物料名称 erpMaterialDO.setDownCenterNumber(materialAttribute.mtrlZhongtongCode()); // 中铜物料编码 @@ -233,7 +234,6 @@ public class ErpMaterialServiceImpl implements ErpMaterialService { } erpMaterialDO.setAbbreviation(materialAttribute.mtrlElement()); // 金属元素缩写 erpMaterialDO.setCreateDate(materialAttribute.mtrlRecordTime()); // 创建日期（物料记录时间） - // 无对应关系的字段（暂未赋值，需根据业务补充映射规则） // erpMaterialDO.setMaterialType(null); // 物料类型 // erpMaterialDO.setMaterialGroupDate(null); // 物料大类组