diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java index 77b44d398..97ab8f927 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java @@ -107,10 +107,10 @@ public class OrderDO extends BaseDO { * 备注 */ private String remark; - /** - * 是否删除 - */ - private Boolean deleted; +// /** +// * 是否删除 +// */ +// private Boolean deleted; /** * 自定义板编号配置id diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderBody/OrderBodyDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderBody/OrderBodyDO.java index 7a2ad59b4..13a221ded 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderBody/OrderBodyDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderBody/OrderBodyDO.java @@ -78,8 +78,8 @@ public class OrderBodyDO extends BaseDO { * 备注 */ private String remark; - /** - * 是否删除 - */ - private Boolean deleted; +// /** +// * 是否删除 +// */ +// private Boolean deleted; } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderGroup/OrderGroupDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderGroup/OrderGroupDO.java index e42519f72..532cb500e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderGroup/OrderGroupDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderGroup/OrderGroupDO.java @@ -79,9 +79,9 @@ public class OrderGroupDO extends BaseDO { * 备注 */ private String remark; - /** - * 是否删除 - */ - private Boolean deleted; +// /** +// * 是否删除 +// */ +// private Boolean deleted; } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderParts/OrderPartsDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderParts/OrderPartsDO.java index 7f0efe4b1..5bb15f995 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderParts/OrderPartsDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderParts/OrderPartsDO.java @@ -102,9 +102,9 @@ public class OrderPartsDO extends BaseDO { * 备注 */ private String remark; - /** - * 是否删除 - */ - private Boolean deleted; +// /** +// * 是否删除 +// */ +// private Boolean deleted; } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDO.java index c1086fd72..54f7f6eca 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDO.java @@ -185,10 +185,10 @@ public class PlateDO extends BaseDO { * 是否作废 */ private Boolean isCancel; - /** - * 是否删除 - */ - private Boolean deleted; +// /** +// * 是否删除 +// */ +// private Boolean deleted; private String customPlateNo; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java index 0f80456e4..ec5d2fac3 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java @@ -57,9 +57,9 @@ public class OrderProcessDO extends BaseDO { * 下一工序 ID */ private Long nextStepId; - /** - * 是否删除 - */ - private Boolean deleted; +// /** +// * 是否删除 +// */ +// private Boolean deleted; } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/processStep/ProcessStepDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/processStep/ProcessStepDO.java index 2710e6f52..4e41a6bb2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/processStep/ProcessStepDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/processStep/ProcessStepDO.java @@ -90,9 +90,9 @@ public class ProcessStepDO extends BaseDO { * 工序处理日期 */ private LocalDateTime processDate; - /** - * 是否删除 - */ - private Boolean deleted; +// /** +// * 是否删除 +// */ +// private Boolean deleted; } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/rawgoods/RawGoodsDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/rawgoods/RawGoodsDO.java index ae9dc3b99..482f84316 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/rawgoods/RawGoodsDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/rawgoods/RawGoodsDO.java @@ -71,9 +71,9 @@ public class RawGoodsDO extends BaseDO { * 规格 */ private String spec; - /** - * 是否删除 - */ - private Boolean deleted; +// /** +// * 是否删除 +// */ +// private Boolean deleted; } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index a523a0f30..dec9e63d6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -822,7 +822,21 @@ public class OrderServiceImpl implements OrderService { } else if (plateGoodDOS != null && !plateGoodDOS.isEmpty()) { // 存在板材 goodsDO.setGoodsId(plateGoodDOS.get(0).getGoodsId()); } else { // 不存在板材 - throw exception(ORDER_MATCH_NOT); +// throw exception(ORDER_MATCH_NOT); + long plateNo = idWorker.nextId(); + long obtainingTime = idWorker.obtainingTime(); + + String goodsId = goodsDO.getGoodsId() == null ? (obtainingTime) + Long.toString(plateNo).substring(2) : goodsDO.getGoodsId(); + goodsDO.setGoodsId(goodsId); + + + Long plateGoods = (Long) identifierGenerator.nextId(null); + + plateGoodDO = BeanUtils.toBean(goodsDO, PlateGoodDO.class) + .setId(plateGoods) + .setGoodsId(goodsId); + + plateGoodLists.add(plateGoodDO); } } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java index 728ed5acc..596d3f5dc 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java @@ -121,6 +121,7 @@ public class PartsController { @Parameter(name = "updateSupport", description = "是否支持更新", example = "true"), @Parameter(name = "organId", description = "配件所属组织ID") }) + @OperateLog(type = IMPORT) @PreAuthorize("@ss.hasAnyPermissions('system:accessory:import','base:accessory:import')") public void importExcel(@RequestParam("file") MultipartFile file, @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport, @@ -152,4 +153,12 @@ public class PartsController { return success(BeanUtils.toBean(pageResult, PartsRespVO.class)); } + @GetMapping("/all") + @Operation(summary = "获取全部配件信息") + @PreAuthorize("@ss.hasAnyPermissions('manage:plate:query','base:plate:query')") + public CommonResult> getPlateAll(@RequestParam("organId") Long organId, + @RequestParam("category") String category) { + List list = partsService.getPartAll(organId,category); + return success(BeanUtils.toBean(list, PartsRespVO.class)); + } } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java index e30cd8aac..2b43a4334 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java @@ -145,6 +145,7 @@ public class PlateController { @Parameter(name = "updateSupport", description = "是否支持更新,默认为 false", example = "true"), @Parameter(name = "organId", description = "板材所属组织ID") }) + @OperateLog(type = IMPORT) // @PreAuthorize("@ss.hasPermission('manage:plate:import')") @PreAuthorize("@ss.hasAnyPermissions('manage:plate:import','base:plate:import')") public void importExcel(@RequestParam("file") MultipartFile file, @@ -171,4 +172,13 @@ public class PlateController { // plateExcelUtil.clear(); } + + @GetMapping("/all") + @Operation(summary = "获取全部板材信息") + @PreAuthorize("@ss.hasAnyPermissions('manage:plate:query','base:plate:query')") + public CommonResult> getPlateAll(@RequestParam("organId") Long organId) { + List list = plateService.getPlateAll(organId); + return success(BeanUtils.toBean(list, PlateRespVO.class)); + } + } \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/parts/PartsMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/parts/PartsMapper.java index 932de050b..fa7235858 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/parts/PartsMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/parts/PartsMapper.java @@ -9,6 +9,8 @@ import com.cf.imes.module.manage.dal.dataobject.parts.PartsDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 配件表 parts_{N} Mapper * @@ -172,4 +174,10 @@ public interface PartsMapper extends BaseMapperX { return selectPage(reqVO, queryWrapper); } + default List getAllByOrganId(Long organId, String category) { + return selectList(new LambdaQueryWrapperX() + .eq(PartsDO::getOrganId, organId) + .eq(PartsDO::getCategory, category) + .eq(PartsDO::getDeleted, 0)); + } } \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java index 05c9faa32..08205cbd8 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java @@ -9,6 +9,8 @@ import com.cf.imes.module.manage.dal.dataobject.plate.PlateDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 板材信息表 plate_{N} Mapper * @@ -91,4 +93,10 @@ public interface PlateMapper extends BaseMapperX { .eq(PlateDO::getGoodsId, goodId) .eq(PlateDO::getOrganId, organId)) > 0; } + + default List getAllByOrganId(Long organId) { + return selectList(new LambdaQueryWrapper() + .eq(PlateDO::getOrganId, organId) + .eq(PlateDO::getDeleted, 0)); + } } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsService.java index 299a19ae8..5d75cf48d 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsService.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsService.java @@ -84,4 +84,6 @@ public interface PartsService { return applicationHome.getDir().getAbsolutePath() + File.separator + "type"; } + + List getPartAll(Long organId, String category); } \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java index 2fcc3a9c4..f064706f7 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java @@ -208,6 +208,12 @@ public class PartsServiceImpl implements PartsService { } } + @Override + public List getPartAll(Long organId, String category) { + organId = getOrganId(BASE_PARTS_QUERY_PERMISSION, getLoginUser().getId(), organId); + return partsMapper.getAllByOrganId(organId , category); + } + private void validateOrganExists(Long organId) { CommonResult index = organApi.validOrgan(organId); if (!index.isSuccess()) { diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java index 87a473419..c2b5a2c8b 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java @@ -30,7 +30,7 @@ public final class PlateExcelListener extends ExcelListener extends ExcelListener extends ExcelListener extends ExcelListener maxLength) { + this.flag = false; + data.setResult(data.getResult() + "," + head + "信息有误"); + } + } + } + /** * 读取完后操作 * diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateService.java index 2d8887e64..7976aaa39 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateService.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateService.java @@ -88,4 +88,6 @@ public interface PlateService { return applicationHome.getDir().getAbsolutePath() + File.separator + "type"; } + + List getPlateAll(Long organId); } \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java index 58b700b7c..69196fc16 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java @@ -150,13 +150,18 @@ public class PlateServiceImpl implements PlateService { PlateDO existPlate = plateMapper.selectByGoodID(importPlate.getGoodsId(), finalOrganId); if (existPlate == null) { respVO.getCreatePlateNames().add(importPlate.getGoodsName()); - insertList.add(BeanUtils.toBean(importPlate, PlateDO.class).setOrganId(finalOrganId).setTexture(Boolean.valueOf(importPlate.getTexture()))); + insertList.add(BeanUtils.toBean(importPlate, PlateDO.class) + .setOrganId(finalOrganId)); +// .setTexture(Boolean.valueOf(importPlate.getTexture())); return; } // 判断是否允许更新 if (!isUpdateSupport) { respVO.getFailurePlateNames().put(importPlate.getGoodsName(), ErrorCodeConstants.PLATE_EXISTS.getMsg()); - PlateDO plateDO = BeanUtils.toBean(importPlate, PlateDO.class).setOrganId(finalOrganId).setId(existPlate.getId()).setTexture(Boolean.valueOf(importPlate.getTexture())); + PlateDO plateDO = BeanUtils.toBean(importPlate, PlateDO.class) + .setOrganId(finalOrganId) + .setId(existPlate.getId()); +// .setTexture(Boolean.valueOf(importPlate.getTexture())); updateList.add(plateDO); } }); @@ -177,6 +182,12 @@ public class PlateServiceImpl implements PlateService { FileHelperUtil.getFile(rootPath, response, value); } + @Override + public List getPlateAll(Long organId) { + organId = getOrganId(BASE_PLATE_QUERY_PERMISSION, getLoginUser().getId(), organId); + return plateMapper.getAllByOrganId( organId); + } + private void validateOrganExists(Long organId) { CommonResult index = organApi.validOrgan(organId); if (!index.isSuccess()) { diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/type/excel_plate_add.xlsx b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/type/excel_plate_add.xlsx index ce5f2918e..f2a8bb33c 100644 Binary files a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/type/excel_plate_add.xlsx and b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/type/excel_plate_add.xlsx differ