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 25a3eca3..cb690b41 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 @@ -130,7 +130,7 @@ public class ErpMaterialController implements BusinessControllerMarker { @DeleteMapping("/deleteErpMaterialCorr") @Operation(summary = "删除ERP物料关系") @PreAuthorize("@ss.hasAnyPermissions({'sply:erp-material:delete','basic:material-config:delete'})") - public CommonResult deleteErpMaterialCorr(@RequestBody BatchDeleteReqVO req) { + public CommonResult deleteErpMaterialCorr(@RequestBody DeleteErpMaterialCorrVO req) { erpMaterialService.deleteErpMaterialCorr(req); return success(true); } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/DeleteErpMaterialCorrVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/DeleteErpMaterialCorrVO.java new file mode 100644 index 00000000..89efe79d --- /dev/null +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/DeleteErpMaterialCorrVO.java @@ -0,0 +1,15 @@ +package com.zt.plat.module.erp.controller.admin.erp.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +@Data +@Schema(description = "删除ErpMaterialCorr请求参数") +public class DeleteErpMaterialCorrVO { + @Schema(description = "ids") + private List materialIds; + @Schema(description = "主物料Id") + private Long materialParentId; +} diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/WarehouseFactoryPageReqVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/WarehouseFactoryPageReqVO.java index c190a173..6583bc29 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/WarehouseFactoryPageReqVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/WarehouseFactoryPageReqVO.java @@ -23,7 +23,7 @@ public class WarehouseFactoryPageReqVO extends PageParam { private String operationType; @Schema(description = "业务类型", example = "2") - private String mMSIType; + private String mmsiType; @Schema(description = "erp源工厂名称", example = "赵六") private String erpSourceFactoryName; diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/WarehouseFactoryRespVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/WarehouseFactoryRespVO.java index 711e8f9a..2585e803 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/WarehouseFactoryRespVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/WarehouseFactoryRespVO.java @@ -30,7 +30,7 @@ public class WarehouseFactoryRespVO { @Schema(description = "业务类型", example = "2") @ExcelProperty("业务类型") - private String mMSIType; + private String mmsiType; @Schema(description = "erp源工厂名称", example = "赵六") @ExcelProperty("erp源工厂名称") diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/WarehouseFactorySaveReqVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/WarehouseFactorySaveReqVO.java index ccb3edb0..16b4da3c 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/WarehouseFactorySaveReqVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/WarehouseFactorySaveReqVO.java @@ -24,7 +24,7 @@ public class WarehouseFactorySaveReqVO { private String operationType; @Schema(description = "业务类型", example = "2") - private String mMSIType; + private String mmsiType; @Schema(description = "erp源工厂名称", example = "赵六") private String erpSourceFactoryName; diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/WarehouseFactoryDO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/WarehouseFactoryDO.java index 0800d14e..877a2e83 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/WarehouseFactoryDO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/WarehouseFactoryDO.java @@ -48,7 +48,7 @@ public class WarehouseFactoryDO extends BusinessBaseDO { * 业务类型 */ @TableField("MMSI_TP") - private String mMSIType; + private String mmsiType; /** * erp源工厂名称 */ diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/WarehouseFactoryMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/WarehouseFactoryMapper.java index 66e6397e..dc37ee5f 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/WarehouseFactoryMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/WarehouseFactoryMapper.java @@ -21,7 +21,7 @@ public interface WarehouseFactoryMapper extends BaseMapperX .eqIfPresent(WarehouseFactoryDO::getCompanyNameCustom, reqVO.getCompanyNameCustom()) .eqIfPresent(WarehouseFactoryDO::getCompanyIdCustom, reqVO.getCompanyIdCustom()) .eqIfPresent(WarehouseFactoryDO::getOperationType, reqVO.getOperationType()) - .eqIfPresent(WarehouseFactoryDO::getMMSIType, reqVO.getMMSIType()) + .eqIfPresent(WarehouseFactoryDO::getMmsiType, reqVO.getMmsiType()) .likeIfPresent(WarehouseFactoryDO::getErpSourceFactoryName, reqVO.getErpSourceFactoryName()) .eqIfPresent(WarehouseFactoryDO::getErpSourceFactoryNumber, reqVO.getErpSourceFactoryNumber()) .likeIfPresent(WarehouseFactoryDO::getErpSourceWarehouseName, reqVO.getErpSourceWarehouseName()) diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrService.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrService.java index 0bdd808b..b7676ed8 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrService.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrService.java @@ -1,6 +1,7 @@ package com.zt.plat.module.erp.service.erp; import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; +import com.zt.plat.module.erp.controller.admin.erp.vo.DeleteErpMaterialCorrVO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialCorrRspVO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialCorrSaveReqVO; import jakarta.validation.Valid; @@ -14,7 +15,7 @@ import java.util.List; */ public interface ErpErpMaterialCorrService { List create(@Valid ErpMaterialCorrSaveReqVO reqVO); - void deleteBatch(BatchDeleteReqVO reqVO); + void deleteBatch(DeleteErpMaterialCorrVO reqVO); List getErpMaterialByMainMaterial(List mainMaterialIds); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrServiceImpl.java index 40caf2c1..023317a2 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrServiceImpl.java @@ -2,6 +2,8 @@ package com.zt.plat.module.erp.service.erp; import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zt.plat.module.erp.controller.admin.erp.vo.DeleteErpMaterialCorrVO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialCorrRspVO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialCorrSaveReqVO; import com.zt.plat.module.erp.dal.dataobject.erp.ErpMaterialCorrDO; @@ -39,8 +41,10 @@ public class ErpErpMaterialCorrServiceImpl implements ErpErpMaterialCorrService{ } @Override - public void deleteBatch(BatchDeleteReqVO reqVO) { - erpErpMaterialCorrMapper.deleteByIds(reqVO.getIds()); + public void deleteBatch(DeleteErpMaterialCorrVO reqVO) { + erpErpMaterialCorrMapper.delete(new LambdaQueryWrapperX() + .eq(ErpMaterialCorrDO::getMaterialParentId, reqVO.getMaterialParentId()) + .in(ErpMaterialCorrDO::getMaterialId, reqVO.getMaterialIds())); } @Override diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialService.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialService.java index a64da689..c734965a 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialService.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialService.java @@ -71,7 +71,7 @@ public interface ErpMaterialService { List createErpMaterialCorr(ErpMaterialCorrSaveReqVO erpMaterialCorrSaveReqVO); - void deleteErpMaterialCorr(BatchDeleteReqVO reqVO); + void deleteErpMaterialCorr(DeleteErpMaterialCorrVO reqVO); ErpMaterialDO getErpMaterialById(Long id); 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 e0d9598f..0bef9cc9 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 @@ -255,7 +255,7 @@ public class ErpMaterialServiceImpl implements ErpMaterialService { @Override - public void deleteErpMaterialCorr(BatchDeleteReqVO reqVO) { + public void deleteErpMaterialCorr(DeleteErpMaterialCorrVO reqVO) { erpMaterialCorrService.deleteBatch(reqVO); } @@ -325,7 +325,6 @@ public class ErpMaterialServiceImpl implements ErpMaterialService { erpMaterialDOList.add(erpMaterialDO); }); } - System.out.println("==============查询物料数据耗时:============"+String.valueOf(System.currentTimeMillis() - startTime)); return new PageResult<>(erpMaterialDOList, departmentMaterialPage.getData().getTotal()); }