Merge remote-tracking branch 'origin/master'

zouyu

2023-11-17 2b0dc519ddc4fefcabc7f60dcda4968964155e11

 mes-plan/src/main/resources/mapper/MasterProductionScheduleMapper.xml

@@ -57,7 +57,9 @@
   </resultMap>

   <select id="getDtoById" resultType="com.chinaztt.mes.plan.dto.MasterProductionScheduleDTO">
      SELECT * FROM plan_master_production_schedule where ID = #{id}
      SELECT *
      FROM plan_master_production_schedule
      where ID = #{id}
   </select>

   <select id="getMasterProductionSchedulePage" resultMap="masterProductionScheduleMap">
@@ -109,7 +111,8 @@
                   from
                      warehouse_join_stock_order wjso
                         left join plan_customer_order pco on pco."id" = wjso.customer_order_id
                         left join plan_join_model_customer pjmc on pjmc.customer_order_id = pco."id" AND pjmc.model = 'plan_master_production_schedule'
      left join plan_join_model_customer pjmc on pjmc.customer_order_id = pco."id" AND pjmc.model =
      'plan_master_production_schedule'
                   where wjso.type = '客户订单预留'
                     and status = '02confirmed'
                     and pjmc.model_id = pmps.id
@@ -126,7 +129,8 @@
                )                manufacturing_quantity
             from plan_master_production_schedule pmps
                    left join basic_part bp on bp."id" = pmps.part_id
                    left join plan_join_model_customer pjmc on pjmc.model_id = pmps.id and pjmc.model = 'plan_master_production_schedule'
      left join plan_join_model_customer pjmc on pjmc.model_id = pmps.id and pjmc.model =
      'plan_master_production_schedule'
                    left join plan_customer_order pco on pco.id = pjmc.customer_order_id
                    left join plan_customer_order_param pcop on pcop.order_id = pco.id and pcop.field = 'LengthRequirement'
                    left join plan_customer_order_param pcop2 on pcop2.order_id = pco.id and pcop2.field = 'Remark'
@@ -153,8 +157,7 @@
   </select>

   <select id="getByIdExt" resultMap="masterProductionScheduleMap">
      select
         D.id,
      select D.id,
         D.factory_id,
         D.mps_no,
         D.required_date,
@@ -180,18 +183,18 @@
         D.manufacture_attr,
         D.promised_delivery_date
      FROM (
             select
                pmps.*,
             select pmps.*,
                bp.part_no,
                bp.part_name,
                bp.description part_description,
                bp.unit,
                (
                   SELECT coalesce(sum(wjso.reserved_quantity), 0)
                   from
                      warehouse_join_stock_order wjso
                     from warehouse_join_stock_order wjso
                         left join plan_customer_order pco on pco."id" = wjso.customer_order_id
                         left join plan_join_model_customer pjmc on pjmc.customer_order_id = pco."id" AND pjmc.model = 'plan_master_production_schedule'
                            left join plan_join_model_customer pjmc on pjmc.customer_order_id = pco."id" AND
                                                            pjmc.model =
                                                            'plan_master_production_schedule'
                   where wjso.type = '客户订单预留'
                     and status = '02confirmed'
                     and pjmc.model_id = pmps.id