生产工序-查询-分堆-打包代码3.0

cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml

@@ -158,7 +158,6 @@
 
 
 
-
         <!-- https://mvnrepository.com/artifact/com.jacob/jacob -->
         <dependency>
             <groupId>com.hynnet</groupId>
@@ -176,7 +175,10 @@
 
 
 
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
 
     </dependencies>
 

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<PageResult<ProcessRespVO>> getGroupingList(@Valid OrderPageReqVO pageReqVO) {
-        //
+
         PageResult<OrderDO> 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<PageResult<OrderPlateListRespVO>> 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) {
-
-
-
-
-
-    }*/
-
 
 
 

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")

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<Long> testpack (@Valid @RequestBody OrderPackageReqVO reqVO) {
-
-        //
-        return success(packService.testpack(reqVO));
-
-
-    }
-
-
 
 
 

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;*/
 
 
 

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;

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 ;
 
 

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;

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;

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<OrderPlateDO> {
 
 
 
-    List<PlateDetailsRespVO> selectPlateDetail(PatchingPlatePageReqVO pageReqVO);
+    List<PatchingDetailRespVO> selectPlateDetail(PatchingPlatePageReqVO pageReqVO);
 
 
 
-    PlateDetailsRespVO selectPlate(@Param("plateId") Long plateId);
+    PatchingDetailRespVO selectPlate(@Param("plateId") Long plateId);
+
+
+
+    default List<OrderPlateDO> selectPlateList(PatchingDetailReqVO reqVO) {
+        return selectList( new LambdaQueryWrapperX<OrderPlateDO>()
+                .and(wrapper -> {
+                    for (Long plateId : reqVO.getPlateIdList()) {
+                        wrapper.or().eq(OrderPlateDO::getId, plateId);
+                    }
+                })
+                .orderByDesc(OrderPlateDO::getId));
+    }
+
+
+    List<PatchingDetailRespVO> selectOtherPlateList(@Param("plateIdList") List<Long> plateIdList);
 }

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<OrderPartsNDO> {
 
 
-    List<PackageDetailsRespVO> selectParts(Long packageNo);
+    List<PackageDetailsRespVO> selectParts(String packageNo);
 
 
     List<OrderPartsRespVO> selectPartsList(Long orderId);

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<OrderPlateListRespVO> joinedGroupPlateList(JoinedPlateReqVO reqVO) {
 

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

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<OrderPackageDO> getOrderPack(Long orderId) {
@@ -87,6 +91,8 @@ public class PackServiceImpl implements PackService {
     }
 
 
+
+
     // 查看生产订单对应的板材信息
     @Override
     public List<PlateDetailsRespVO> getOrderPlateList(Long orderId) {
@@ -96,6 +102,8 @@ public class PackServiceImpl implements PackService {
     }
 
 
+
+
     // 查看板材列表分页
     @Override
     public PageResult<PlateDetailsRespVO> queryPlateDetails(OrderModuleReqVO pageReqVO) {
@@ -110,6 +118,8 @@ public class PackServiceImpl implements PackService {
     }
 
 
+
+
     // 查看配件列表分页
     @Override
     public PageResult<OrderPartsRespVO> 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<OrderPlateGroupRespVO> GetOrderPlateGroup(Long orderId) {
@@ -150,6 +164,8 @@ public class PackServiceImpl implements PackService {
     }
 
 
+
+
     // 查看配件包裹详情
     @Override
     public List<OrderPartsRespVO> 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());

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

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 @@
 
 
 
-    <resultMap id="PlateDetailMap" type="com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO">
+    <resultMap id="PlateDetailMap" type="com.cf.imes.module.manage.controller.admin.patching.vo.PatchingDetailRespVO">
 
         <result property="orderId" column="orderId"/>
         <result property="cabinetName" column="cabinetName"/>
         <result property="plateNo" column="plateNo"/>
-        <result property="plateName" column="plateName"/>
+        <result property="name" column="plateName"/>
         <result property="height" column="height"/>
         <result property="width" column="width"/>
         <result property="thickness" column="thickness"/>
@@ -125,4 +125,45 @@
 
         where op.id = #{plateId}
     </select>
+
+
+
+
+    <resultMap id="OtherPlateMap" type="com.cf.imes.module.manage.controller.admin.patching.vo.PatchingDetailRespVO">
+
+        <result property="roomName" column="roomName"/>
+        <result property="roomId" column="roomId"/>
+        <result property="cabinetName" column="cabinetName"/>
+        <result property="bodyId" column="bodyId"/>
+        <result property="material" column="material"/>
+        <result property="color" column="color"/>
+
+    </resultMap>
+    <select id="selectOtherPlateList"
+            resultMap="OtherPlateMap"
+            parameterType="java.lang.Long">
+
+
+        select op.*,
+               oi.room_id as roomId,
+               oi.body_id as bodyId,
+               ob.room_name as roomName,
+               ob.name as cabinetName,
+               p.material as material,
+               p.color as color
+
+        from order_plate op
+                 join order_item oi on op.id = oi.plate_id
+                 join order_body ob on oi.body_id = ob.id
+                 join plate p on op.goods_id = p.goods_id
+
+        where op.id in
+        <foreach item="id" collection="plateIdList" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+
+
+    </select>
+
+
 </mapper>

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};
 
 
-
-
      </select>