获得机台新增品牌信息，排单，打包补全部分代码逻辑

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderDO.java

@@ -38,6 +38,10 @@ public class OrderDO extends BaseDO {
     // 客户地址
     private String address;
 
+    // 生产单日期
+    private LocalDateTime orderDate;
+
+
     // 客户电话
     private String phoneNumber;
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/query/OrderItemDO.java

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
-import java.math.BigDecimal;
-
 @TableName("order_item")
 @Data
 @ToString(callSuper = true)
@@ -24,6 +22,9 @@ public class OrderItemDO {
     // 生产单号
     private Long orderId;
 
+    // 明细类型，1 板材 2 五金/配件 3 其他 4 报价配件
+    private Integer type;
+
     // 房间 ID
     private Long roomId;
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/remainplaten/RemainPlateDO.java

@@ -1,9 +1,8 @@
 package com.cf.imes.module.manage.dal.dataobject.remainplaten;
 
-import com.cf.imes.framework.organ.core.db.OrganBaseDO;
-import lombok.*;
 import com.baomidou.mybatisplus.annotation.*;
 import com.cf.imes.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
 import java.math.BigDecimal;
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java

@@ -11,7 +11,6 @@ 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.pack.vo.PackRespVO;
 import com.cf.imes.module.manage.controller.admin.pack.vo.PlateAndPartIdList;
-import com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO;
 import com.cf.imes.module.manage.controller.admin.query.vo.pack.OrderPackageVO;
 import com.cf.imes.module.manage.dal.dataobject.query.OrderPackageDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -24,12 +23,6 @@ public interface OrderPackageMapper extends BaseMapperX<OrderPackageDO> {
 
 
 
-//    default List<OrderPackageDO> selectByOrderNo(PackageDetailsReqVO reqVO) {
-//        return selectList(new LambdaQueryWrapperX<OrderPackageDO>()
-//                .eqIfPresent(OrderPackageDO::getOrderNo, orderNo)
-//                .orderByDesc(OrderPackageDO::getId));
-//    }
-
 
 //    IPage<OrderPackageVO> selectByOrderNo(@Param("page") IPage page, @Param("reqVO") PackageDetailsReqVO reqVO,@Param("packId") List<Long> packId, @Param("organId") Long organId);
 
@@ -46,10 +39,6 @@ public interface OrderPackageMapper extends BaseMapperX<OrderPackageDO> {
     List<PackRespVO> selectPackPage(@Param("orderIds") List<Long> orderIds,@Param("organId") Long organId);
 
 
-    IPage<PlateDetailsRespVO> selectMissingBoard( @Param("page") IPage page, @Param("orderNo") Long orderNo, @Param("organId") Long organId);
-
-
-
 
     default OrderPackageDO selectByPackId(Long packId,Long orderId,Long organId) {
         return selectOne(new LambdaQueryWrapperX<OrderPackageDO>()

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPrepackagedMapper.java

@@ -6,20 +6,11 @@ import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cf.imes.module.manage.dal.dataobject.pack.OrderPrepackagedDO;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-
 @Mapper
 public interface OrderPrepackagedMapper extends BaseMapperX<OrderPrepackagedDO> {
 
 
 
-    default List<OrderPrepackagedDO> selectOrderList(Long orderId, Long organId) {
-        return selectList(new LambdaQueryWrapperX<OrderPrepackagedDO>()
-                .eq(OrderPrepackagedDO::getOrganId, organId)
-                .eqIfPresent(OrderPrepackagedDO::getOrderId, orderId));
-    }
-
-
 
     default OrderPrepackagedDO selectOrder(Long orderId, Long organId) {
         return selectOne(new LambdaQueryWrapperX<OrderPrepackagedDO>()

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/OrdersMapper.java

@@ -40,13 +40,10 @@ public interface OrdersMapper extends BaseMapperX<OrderDO> {
 
 
 
-    List<PackRespVO>  selectOrderIdsFalse( @Param("createTime") String createTime,@Param("organId")  Long organId, @Param("orderId") Long orderId);
+    List<PackRespVO>  selectOrderIdsFalse(@Param("createTime")  String createTime,@Param("organId")  Long organId, @Param("orderId") Long orderId);
 
 
 
-    IPage<PackRespVO> selectOrderPlate(@Param("page") IPage page, @Param("orderIds") List<Long> orderIds, @Param("organId")  Long organId);
-
-
 
     PrintOrderPackRespVO selectOrderPack(@Param("orderNo")Long orderNo, @Param("packageNo") Long packageNo, @Param("organId")  Long organId);
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java

@@ -4,6 +4,7 @@ package com.cf.imes.module.manage.service.pack;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
+import com.cf.imes.framework.common.enums.OrderItemTypeEnum;
 import com.cf.imes.framework.common.enums.OrderPackageStatusEnum;
 import com.cf.imes.framework.common.enums.OrderPackageTypeEnum;
 import com.cf.imes.framework.common.enums.UserSettingTypeEnum;
@@ -693,6 +694,7 @@ public class PackServiceImpl implements PackService {
         // 在生产单明细表中添加数据（生产单号，配件ID，包裹ID，部件数量）
         OrderItemDO orderItemDO = new OrderItemDO();
         orderItemDO.setOrderId(reqVO.getOrderId());
+        orderItemDO.setType(OrderItemTypeEnum.QUOTATIONACCESSORIES.getType());
         orderItemDO.setPartsId(orderParts.getId());
         orderItemDO.setPackageId(orderPackageDO.getId());
         orderItemDO.setNum(reqVO.getNum());

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml

@@ -5,9 +5,6 @@
     <resultMap id="PackMap" type="com.cf.imes.module.manage.controller.admin.pack.vo.PackRespVO">
 
         <result property="id" column="orderId"/>
-<!--        <result property="packCount" column="packCount"/>-->
-<!--        <result property="packPieceCount" column="packPieceCount"/>-->
-
         <collection property="plateIdList" ofType="java.lang.Long" column="plateId"/>
 
         <collection property="packIdList" ofType="java.lang.Long" column="packId"/>
@@ -73,66 +70,6 @@
 
 
 
-
-
-    <resultMap id="PlateDetailsMap" type="com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO">
-        <result property="roomName" column="roomName"/>
-        <result property="cabinetName" column="bodyName"/>
-        <result property="plateNo" column="palteId"/>
-        <result property="plateName" column="plateName"/>
-        <result property="material" column="plateMaterial"/>
-        <result property="color" column="palteColor"/>
-        <result property="width" column="plateWidth"/>
-        <result property="height" column="plateHeight"/>
-        <result property="thickness" column="plateThickness"/>
-        <result property="area" column="plateArea"/>
-        <result property="texture" column="texture"/>
-        <result property="specialShaped" column="specialShaped"/>
-        <result property="profiling" column="profiling"/>
-        <result property="rowHole" column="rowHole"/>
-        <result property="remark" column="remark"/>
-        <result property="processGroup" column="name"/>
-    </resultMap>
-    <select id="selectMissingBoard"
-            parameterType="java.lang.Long"
-            resultMap="PlateDetailsMap">
-
-        select DISTINCT
-        ob.room_name as roomName,
-        ob.name as bodyName,
-        op.id as palteId,
-        op.name as plateName,
-        ogs.material as plateMaterial,
-        ogs.color as palteColor,
-        op.height as plateHeight,
-        op.width as plateWidth,
-        op.thickness as plateThickness,
-        op.area as plateArea,
-        op.texture as texture,
-        op.remark as remark,
-        op.is_special_shaped as specialShaped,
-        op.is_sculpt as profiling,
-        op.is_row_hole AS rowHole
-
-        from order_plate op
-        join order_goods ogs on op.goods_id = ogs.id and op.organ_id = ogs.organ_id
-        join order_item oi on op.id = oi.plate_id and op.organ_id = oi.organ_id
-        join order_body ob on oi.body_id = ob.id and oi.organ_id = ob.organ_id
-
-        where
-            oi.order_id = #{orderNo}
-        and
-            oi.organ_id = #{organId}
-        and oi.plate_id != 0
-        and
-            op.id not in (
-        select DISTINCT oi2.plate_id
-        from order_item oi2
-        where  oi2.order_id = #{orderNo} and oi2.package_id &lt;&gt; '');
-
-    </select>
-
-
     <update id="updateParts"
             parameterType="java.lang.Long">
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/OrdersMapper.xml

@@ -22,7 +22,7 @@
             splitter as splitter,
             packaged as packaged
         FROM orders
-        WHERE  organ_id = #{organId} and deleted = false and status != 0 and create_time >= #{createTime} and id != #{orderId}
+        WHERE  organ_id = #{organId} and deleted = false and status in (1,2,3,4) and create_time >= #{createTime}  and id != #{orderId}
         ORDER BY create_time
             LIMIT 1 ;
 
@@ -49,7 +49,7 @@
             splitter as splitter,
             packaged as packaged
         FROM orders
-        WHERE   organ_id = #{organId} and deleted = false and status != 0 and create_time <=  #{createTime} and id != #{orderId}
+        WHERE   organ_id = #{organId} and deleted = false and status != 0 and create_time <= #{createTime} and id != #{orderId}
         ORDER BY create_time desc
             LIMIT 1 ;
 
@@ -81,43 +81,6 @@
 
     </resultMap>
 
-    <select id="selectOrderPlate"
-            parameterType="java.lang.Long"
-            resultMap="PackMap">
-
-
-        SELECT distinct
-        o.id as orderNo,
-        o.custom_order_no as customOrderNo,
-        o.dealer as dealer,
-        o.dealer_phone_number as dealerPhoneNumber,
-        o.order_date as orderDate,
-        o.create_time as createTime,
-        o.delivery_date as deliveryDate,
-        o.customer as customer,
-        o.phone_number as phoneNumber,
-        o.address as address,
-        o.salesman as salesman,
-        o.splitter as splitter,
-        o.packaged as packaged,
-        (count(distinct oi.plate_id )-1) as totalPieceCount
-
-        FROM `orders` o
-        join order_item oi on o.id = oi.order_id and o.organ_id = oi.organ_id
-
-        WHERE
-        o.organ_id = #{organId}  and
-        o.id in
-        <foreach item="id" collection="orderIds" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-
-        group by orderNo,customOrderNo,dealer,deliveryDate,customer,phoneNumber,address,salesman,splitter,packaged,dealerPhoneNumber,orderDate,o.create_time
-
-        order by o.create_time desc
-
-    </select>
-
 
 
     <resultMap id="PrintMap" type="com.cf.imes.module.manage.controller.admin.pack.vo.PrintOrderPackRespVO">
@@ -200,7 +163,7 @@
 
         </where>
 
-        order by order_date desc
+        order by create_time desc
 
     </select>