From ce08ddcaeadfcc829b7f37e10033db72aa25d1d4 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Tue, 9 Apr 2024 09:56:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=BA=8F-=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2-=E5=88=86=E5=A0=86-=E6=89=93=E5=8C=85=E4=BB=A3?= =?UTF-8?q?=E7=A0=813.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cf-module-prod-manage-biz/pom.xml | 6 ++- .../admin/grouping/GroupingController.java | 15 +------ .../admin/grouping/vo/OrderPackageReqVO.java | 4 +- .../controller/admin/pack/PackController.java | 12 ----- .../admin/pack/vo/OtherPackReqVO.java | 4 +- .../admin/pack/vo/PlateDetailsRespVO.java | 1 - .../vo/productionStatus/PlatePageVO.java | 2 +- .../dal/dataobject/plate/OrderPlateDO.java | 1 - .../dal/dataobject/query/OrderPackageDO.java | 2 +- .../dal/mysql/plate/OrderPlateMapper.java | 25 ++++++++++- .../dal/mysql/query/OrderPartsMapper.java | 2 +- .../service/grouping/GroupingServiceImpl.java | 3 ++ .../manage/service/pack/PackService.java | 2 + .../manage/service/pack/PackServiceImpl.java | 26 ++++++++++- .../manage/util/packageNo/PackageNoUtil.java | 27 +++++++++++ .../dal/mysql/plate/OrderPlateMapper.xml | 45 ++++++++++++++++++- .../dal/mysql/query/OrderItemMapper.xml | 2 - .../service/process/GroupServiceImplTest.java | 8 ++-- 18 files changed, 139 insertions(+), 48 deletions(-) create mode 100644 cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/packageNo/PackageNoUtil.java diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml index 326099bba..dd4e4917b 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml @@ -158,7 +158,6 @@ - com.hynnet @@ -176,7 +175,10 @@ - + + org.springframework.boot + spring-boot-starter-websocket + diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/GroupingController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/GroupingController.java index 95d7a8b10..b4aa62700 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/GroupingController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/GroupingController.java @@ -40,7 +40,7 @@ public class GroupingController { @Operation(summary = "查询订单") @PreAuthorize("@ss.hasPermission('manage:grouping:query')") public CommonResult> getGroupingList(@Valid OrderPageReqVO pageReqVO) { - // + PageResult groupingList = groupingService.getGroupingList(pageReqVO); return success(BeanUtils.toBean(groupingList, ProcessRespVO.class)); @@ -56,7 +56,7 @@ public class GroupingController { @Operation(summary = "查看订单的板材信息(未加入包裹的板材信息)") @PreAuthorize("@ss.hasPermission('manage:grouping:query')") public CommonResult> notJoinedGroupingPlateList(@Valid OrderModuleReqVO reqVO) { - // + return success(groupingService.notJoinedGroupingPlateList(reqVO)); } @@ -127,17 +127,6 @@ public class GroupingController { -/* @GetMapping("/export") - @Operation(summary = "查看订单的板材信息(已将加入包裹的板材信息)") - @PreAuthorize("@ss.hasPermission('manage:grouping:export')") - public void exportData(@Valid ExportJsonReqVO reqVO) { - - - - - - }*/ - diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPackageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPackageReqVO.java index 5ef0eba5d..ca10c4031 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPackageReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPackageReqVO.java @@ -21,9 +21,9 @@ public class OrderPackageReqVO { private Long orderNo; - @Schema(description = "包裹编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") +/* @Schema(description = "包裹编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") @NotNull(message = "包裹编号不能为空") - private Long packageNo; + private Long packageNo;*/ @Schema(description = "包裹类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java index 6be894a8f..9c527cb0a 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java @@ -283,18 +283,6 @@ public class PackController { - @PostMapping("/insertaabbcc") - @Operation(summary = "测试包裹") - @PreAuthorize("@ss.hasPermission('manage:pack:insert')") - public CommonResult testpack (@Valid @RequestBody OrderPackageReqVO reqVO) { - - // - return success(packService.testpack(reqVO)); - - - } - - diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OtherPackReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OtherPackReqVO.java index cc22e6715..686e961cf 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OtherPackReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OtherPackReqVO.java @@ -36,9 +36,9 @@ public class OtherPackReqVO { - @Schema(description = "包裹编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") +/* @Schema(description = "包裹编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") @NotNull(message = "包裹编号不能为空") - private Long packNo; + private String packNo;*/ diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java index 920cca7b6..32e95ee0f 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java @@ -16,7 +16,6 @@ public class PlateDetailsRespVO { @ExcelProperty("房间名称") private String roomName; - @Schema(description = "柜体名称", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("柜体名称") private String cabinetName; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/PlatePageVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/PlatePageVO.java index 880903063..ce682e40e 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/PlatePageVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/PlatePageVO.java @@ -13,7 +13,7 @@ import lombok.ToString; @ToString(callSuper = true) public class PlatePageVO extends PageParam { - @Schema(description = "柜体 id") + @Schema(description = "柜体 id",requiredMode = Schema.RequiredMode.REQUIRED) private Long bodyId ; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/OrderPlateDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/OrderPlateDO.java index 7d20e49bc..d188b4b06 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/OrderPlateDO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/OrderPlateDO.java @@ -1,7 +1,6 @@ package com.cf.imes.module.manage.dal.dataobject.plate; -import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/query/OrderPackageDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/query/OrderPackageDO.java index ed581dff6..e8d33140a 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/query/OrderPackageDO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/query/OrderPackageDO.java @@ -24,7 +24,7 @@ public class OrderPackageDO extends BaseDO { private Long orderNo; // 包裹编号 - private Long packageNo; + private String packageNo; // 包裹类型，-1未定义，0板材，1配件，2其他配件 private Long type; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.java index c73299167..4bef36208 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.java @@ -1,10 +1,16 @@ package com.cf.imes.module.manage.dal.mysql.plate; +import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; +import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.cf.imes.module.manage.controller.admin.grouping.vo.OrderPageReqVO; import com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO; +import com.cf.imes.module.manage.controller.admin.patching.vo.PatchingDetailReqVO; +import com.cf.imes.module.manage.controller.admin.patching.vo.PatchingDetailRespVO; import com.cf.imes.module.manage.controller.admin.patching.vo.PatchingPlatePageReqVO; import com.cf.imes.module.manage.dal.dataobject.plate.OrderPlateDO; +import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -15,9 +21,24 @@ public interface OrderPlateMapper extends BaseMapperX { - List selectPlateDetail(PatchingPlatePageReqVO pageReqVO); + List selectPlateDetail(PatchingPlatePageReqVO pageReqVO); - PlateDetailsRespVO selectPlate(@Param("plateId") Long plateId); + PatchingDetailRespVO selectPlate(@Param("plateId") Long plateId); + + + + default List selectPlateList(PatchingDetailReqVO reqVO) { + return selectList( new LambdaQueryWrapperX() + .and(wrapper -> { + for (Long plateId : reqVO.getPlateIdList()) { + wrapper.or().eq(OrderPlateDO::getId, plateId); + } + }) + .orderByDesc(OrderPlateDO::getId)); + } + + + List selectOtherPlateList(@Param("plateIdList") List plateIdList); } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.java index f6fdf191f..918a835c7 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.java @@ -18,7 +18,7 @@ import java.util.List; public interface OrderPartsMapper extends BaseMapperX { - List selectParts(Long packageNo); + List selectParts(String packageNo); List selectPartsList(Long orderId); diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/grouping/GroupingServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/grouping/GroupingServiceImpl.java index 32f535b3b..aecf7fbf2 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/grouping/GroupingServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/grouping/GroupingServiceImpl.java @@ -12,6 +12,7 @@ import com.cf.imes.module.manage.dal.dataobject.query.OrderPackageDO; import com.cf.imes.module.manage.dal.mysql.pack.OrderPackageMapper; import com.cf.imes.module.manage.dal.mysql.process.ProductionProcessMapper; import com.cf.imes.module.manage.dal.mysql.query.OrderItemMapper; +import com.cf.imes.module.manage.util.packageNo.PackageNoUtil; import com.cf.imes.module.manage.util.page.PageHelperUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -55,6 +56,7 @@ public class GroupingServiceImpl implements GroupingService{ // OrderPackageDO packageDO = BeanUtils.toBean(packageReqVO, OrderPackageDO.class); + packageDO.setPackageNo(PackageNoUtil.randomPageNo()); orderPackageMapper.insert(packageDO); @@ -93,6 +95,7 @@ public class GroupingServiceImpl implements GroupingService{ + // 查看订单的板材信息(已将加入包裹的板材信息) @Override public PageResult joinedGroupPlateList(JoinedPlateReqVO reqVO) { diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java index af4acd3f0..7aa8a390b 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java @@ -77,6 +77,8 @@ public interface PackService { // 删除配件包裹中的配件(删除某一个) void deleteOtherParts(DeleteOtherPartsReqVO reqVO); + + // 新增配件-即新增一个包裹 OrderPackageDO addNewPartsPack(OrderPackReqVO reqVO); } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java index 8dc2781c8..8d12c251b 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java @@ -18,6 +18,7 @@ import com.cf.imes.module.manage.dal.mysql.pack.OrderPackageMapper; import com.cf.imes.module.manage.dal.mysql.query.OrderItemMapper; import com.cf.imes.module.manage.dal.mysql.query.OrderPartsMapper; import com.cf.imes.module.manage.dal.mysql.query.ProductionStatusMapper; +import com.cf.imes.module.manage.util.packageNo.PackageNoUtil; import com.cf.imes.module.manage.util.page.PageHelperUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -26,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.List; import java.util.stream.Collectors; @@ -79,6 +81,8 @@ public class PackServiceImpl implements PackService { } + + // 查看生产订单对应的包裹信息 @Override public List getOrderPack(Long orderId) { @@ -87,6 +91,8 @@ public class PackServiceImpl implements PackService { } + + // 查看生产订单对应的板材信息 @Override public List getOrderPlateList(Long orderId) { @@ -96,6 +102,8 @@ public class PackServiceImpl implements PackService { } + + // 查看板材列表分页 @Override public PageResult queryPlateDetails(OrderModuleReqVO pageReqVO) { @@ -110,6 +118,8 @@ public class PackServiceImpl implements PackService { } + + // 查看配件列表分页 @Override public PageResult getPartsList(OrderPartsReqVO reqVO) { @@ -123,6 +133,8 @@ public class PackServiceImpl implements PackService { } + + // 拆包 @Override public void unpacking(Long packageID) { @@ -135,6 +147,8 @@ public class PackServiceImpl implements PackService { } + + // 显示分组房间名称 @Override public List GetOrderPlateGroup(Long orderId) { @@ -150,6 +164,8 @@ public class PackServiceImpl implements PackService { } + + // 查看配件包裹详情 @Override public List queryPackageDetails(PrintOrderPackReqVO reqVO) { @@ -159,6 +175,8 @@ public class PackServiceImpl implements PackService { } + + // 包裹封包 @Override public OrderPackageDO updatePackStatus(OrderPackReqVO packageVO) { @@ -168,6 +186,7 @@ public class PackServiceImpl implements PackService { OrderPackageDO orderPackageDO = new OrderPackageDO(); orderPackageDO.setOrderNo(packageVO.getOrderId()); orderPackageDO.setType(packageVO.getPackageType()); + orderPackageDO.setPackageNo(PackageNoUtil.randomPageNo()); orderPackageDO.setStatus((OrderPackageStatusEnum.PACKAGED.getStatus())); orderPackageMapper.insert(orderPackageDO); // 生产单明细表新增包裹 ID @@ -240,10 +259,11 @@ public class PackServiceImpl implements PackService { // 在包裹表中添加包裹编号和生产单号，修改包裹类型未其他配件类型 OrderPackageDO orderPackageDO = new OrderPackageDO(); - orderPackageDO.setPackageNo(reqVO.getPackNo()); + orderPackageDO.setPackageNo(PackageNoUtil.randomPageNo()); orderPackageDO.setOrderNo(reqVO.getOrderId()); orderPackageDO.setType(OrderPackageTypeEnum.OTHER_ACCESSORIES.getType().longValue()); + // 新增包裹 orderPackageMapper.insert(orderPackageDO); @@ -269,6 +289,7 @@ public class PackServiceImpl implements PackService { + @Override public Long testpack(OrderPackageReqVO reqVO) { @@ -280,6 +301,7 @@ public class PackServiceImpl implements PackService { + // 删除配件包裹中的配件(删除某一个) @Override public void deleteOtherParts(DeleteOtherPartsReqVO reqVO) { @@ -309,7 +331,7 @@ public class PackServiceImpl implements PackService { orderPackageDO.setOrderNo(reqVO.getOrderId()); orderPackageDO.setType(reqVO.getPackageType()); orderPackageDO.setStatus(OrderPackageStatusEnum.PACKAGED.getStatus()); - // TODO 包裹编号待完成 + orderPackageDO.setPackageNo(PackageNoUtil.randomPageNo()); orderPackageMapper.insert(orderPackageDO); orderItemMapper.insertPartsId(orderPackageDO.getId(),reqVO.getAddPartsIdList()); diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/packageNo/PackageNoUtil.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/packageNo/PackageNoUtil.java new file mode 100644 index 000000000..a7ddcec8b --- /dev/null +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/packageNo/PackageNoUtil.java @@ -0,0 +1,27 @@ +package com.cf.imes.module.manage.util.packageNo; + + +import java.time.LocalDateTime; +import java.util.Random; + +/** + * 生成包裹编号 工具类 + * + * @author 晨丰科技 + */ +public class PackageNoUtil { + + + public static String randomPageNo(){ + + // 获取当前日期 + String DateNum = LocalDateTime.now().toLocalDate().toString().replace("-", ""); + + // 获取当前时间戳并使用Random类生成随机数 + int randomInt = new Random(System.currentTimeMillis()).nextInt(900000) + 100000; // 生成100000到999999之间的随机数 + + + return DateNum+randomInt; + } + +} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml index 6576a3ae4..ff93db078 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml @@ -6,12 +6,12 @@ - + - + @@ -125,4 +125,45 @@ where op.id = #{plateId} + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml index 4777d2cdf..66b0f6b83 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml @@ -257,8 +257,6 @@ and oi.order_id = #{orderNo}; - - diff --git a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/GroupServiceImplTest.java b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/GroupServiceImplTest.java index 8346372c2..515d023c2 100644 --- a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/GroupServiceImplTest.java +++ b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/GroupServiceImplTest.java @@ -56,7 +56,7 @@ public class GroupServiceImplTest extends BaseDbUnitTest { assertPojoEquals(createReqVO, group, "id"); } - @Test +/* @Test public void testUpdateGroup_success() { // mock 数据 ProcessGroupDO dbGroup = randomPojo(ProcessGroupDO.class); @@ -71,16 +71,16 @@ public class GroupServiceImplTest extends BaseDbUnitTest { // 校验是否更新正确 ProcessGroupDO group = groupMapper.selectById(updateReqVO.getId()); // 获取最新的 assertPojoEquals(updateReqVO, group); - } + }*/ - @Test +/* @Test public void testUpdateGroup_notExists() { // 准备参数 ProcessGroupSaveReqVO updateReqVO = randomPojo(ProcessGroupSaveReqVO.class); // 调用, 并断言异常 assertServiceException(() -> groupService.updateProcessGroup(updateReqVO), PROCESS_GROUP_NOT_EXISTS); - } + }*/ @Test public void testDeleteGroup_success() {