zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into test

Browse Source
This commit is contained in:
qianshijiang
2026-01-14 09:26:20 +08:00
parent 537bbc0742 44ee8b5ec9
commit 438955dd63
9 changed files with 69 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialDestroyController.java
View File

@@ -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<MaterialDestroyRespVO> 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<Boolean> 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<Boolean> 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<Boolean> 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<Boolean> enableMaterialDestroyList(@RequestBody List<MaterialDestroyRespVO> saveReqVOS) {
materialDestroyService.enableMaterialDestroyList(saveReqVOS);
return success(true);

9
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/TaxController.java
View File

@@ -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<Boolean> enableTaxList(@Validated @RequestBody List<TaxStsVO> req) {
taxService.enableTaxList(req);
return success(true);
}
}

12
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/TaxStsVO.java Normal file
View File

@@ -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;
}

3
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/TaxService.java
View File

@@ -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<TaxDO> getTaxPage(TaxPageReqVO pageReqVO);
void enableTaxList(List<TaxStsVO> req);
}

13
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/TaxServiceImpl.java
View File

@@ -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<TaxStsVO> req) {
req.forEach(item -> {
TaxDO tax = new TaxDO();
tax.setId(Long.valueOf(item.getId()));
tax.setIsEnable(item.getIsEnable());
taxMapper.updateById(tax);
});
}
}

18
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpMaterialController.java
View File

@@ -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<List<ErpMaterialRespVO>> getErpMaterialByApi(@RequestBody MaterialInfomationPageReqDTO material) {
public CommonResult<List<ErpMaterialRespVO>> 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<ErpMaterialDO> 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<ErpMaterialRespVO> getErpMaterialByMainMaterialByCode(String code) {
public CommonResult<ErpMaterialRespVO> 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<List<ErpMaterialRespVO>> getErpMaterialByApiByCode(String code) {
public CommonResult<List<ErpMaterialRespVO>> getErpMaterialByApiByCode(@RequestParam("materialNumber")String code) {
return success(BeanUtils.toBean(erpMaterialService.getErpMaterialByApiByCode(code), ErpMaterialRespVO.class));
}

13
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/MaterialInfomationApiVO.java Normal file
View File

@@ -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;
}

3
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpMaterialDO.java
View File

@@ -126,4 +126,7 @@ public class ErpMaterialDO extends BusinessBaseDO {
@TableField("DEC")
private Long decimalValue;
@TableField(exist = false)
private String materialNumber;
}

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java
View File

@@ -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); // 物料大类组