Changes16

Fixiaobai

2023-11-17 2fb28b36f15de26249ae34160e1accf118c011c7

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

@@ -242,52 +242,114 @@
      pco.centralized_mining_property
   </sql>

   <resultMap id="resultMap" type="com.chinaztt.mes.plan.vo.CustomerOrderVO2">
      <id property="id" column="id"/>
      <result property="contractNo" column="contract_no"/>
      <result property="entityName" column="entity_name"/>
      <result property="createUser" column="create_user"/>
      <result property="createTime" column="create_time"/>
      <result property="placeOrderDate" column="place_order_date"/>
      <result property="customerName" column="customer_name"/>
      <result property="coState" column="co_state"/>
      <result property="isAudit" column="is_audit"/>
      <result property="sourceId" column="source_id"/>
      <result property="productType" column="product_type"/>
      <result property="partNo" column="part_no"/>
      <result property="productName" column="product_name"/>
      <result property="customerPartSpec" column="customer_part_spec"/>
      <result property="otcUnit" column="otc_unit"/>
      <result property="buyQtyDue" column="buy_qty_due"/>
      <result property="docNumber" column="number"/>
      <result property="technologyDocumentId" column="technology_document_id"/>
      <result property="returnStatus" column="return_status"/>
      <result property="originalContractStatus" column="original_contract_status"/>
      <result property="salesMan" column="sales_man"/>
      <result property="deliveryDate" column="delivery_date"/>
      <result property="manufactureAttr" column="manufacture_attr"/>
      <result property="remark" column="remark"/>
      <result property="wantedDeliveryDate" column="wanted_delivery_date"/>
   </resultMap>

    <!-- 需要处理 -->
   <select id="getCustomerOrderPage" resultMap="dtoResultMap">
      SELECT
         *
   <select id="getCustomerOrderPage" resultMap="resultMap">
      select * from (SELECT
      pco.id ,
      contract_no ,
      pc.entity_name ,
      pc.create_user ,
      pc.create_time ,
      place_order_date ,
      pc.customer_name ,
      co_state ,
      is_audit ,
      source_id ,
      product_type ,
      pco.part_no ,
      product_name ,
      customer_part_spec ,
      otc_unit ,
      buy_qty_due ,
      technology_document_id,
      td.number ,
      return_status ,
      original_contract_status ,
      sales_man ,
      delivery_date,
      manufacture_attr,
      pco.remark,
      wanted_delivery_date
      FROM
         (SELECT
               <include refid="customerOrder_property"/>,
               (SELECT COALESCE(SUM(pmps.qty_required),0)
                 FROM plan_master_production_schedule pmps
                 LEFT JOIN plan_join_model_customer pjmc on pjmc.model_id=pmps."id" AND pjmc.model = 'plan_master_production_schedule'
                 WHERE pjmc.customer_order_id=pco."id")
                 require_number,
             (SELECT COALESCE(SUM(wjso.reserved_quantity),0)
                 FROM warehouse_join_stock_order wjso
                 WHERE wjso.customer_order_id = pco."id" AND wjso.type ='客户订单预留' AND status ='02confirmed' )
                 reserved_quantity_realtime,
             bp."id" part_id,
             bp.part_name,
             bp.unit,
             pc.entity_name,
             pc.verify_date,
               pc.customer_contract_no,
               pc.comment,
             pc.return_status,
               pc.place_order_date,
               pc.factory_place_order_date,
               pc.original_contract_status,
               pc.end_time,
               cop.value outerColor,
               td.name doc_name,
               td.number doc_number,
               td.insulation_color,
               td.sheath_color
          FROM
             plan_customer_order pco
                 LEFT JOIN plan_customer pc ON pc."id" = pco.customer_id
                LEFT JOIN basic_part bp ON bp.part_no = pco.part_no
                LEFT JOIN technology_document td ON td.id = pco.technology_document_id
                LEFT JOIN plan_customer_order_param cop ON cop.order_id = pco.ID
                AND field = 'OuterColor'
         ) tempA
      <where>
      plan_customer_order pco
      LEFT JOIN plan_customer pc ON pc."id" = pco.customer_id
      LEFT JOIN technology_document td ON td.id = pco.technology_document_id) tempA
      where 1=1
         <if test="ew.emptyOfWhere == false">
            and ${ew.SqlSegment}
         </if>
      </where>
<!--      SELECT-->
<!--         *-->
<!--      FROM-->
<!--         (SELECT-->
<!--               <include refid="customerOrder_property"/>,-->
<!--               (SELECT COALESCE(SUM(pmps.qty_required),0)-->
<!--                 FROM plan_master_production_schedule pmps-->
<!--                 LEFT JOIN plan_join_model_customer pjmc on pjmc.model_id=pmps."id" AND pjmc.model = 'plan_master_production_schedule'-->
<!--                 WHERE pjmc.customer_order_id=pco."id")-->
<!--                 require_number,-->
<!--             (SELECT COALESCE(SUM(wjso.reserved_quantity),0)-->
<!--                 FROM warehouse_join_stock_order wjso-->
<!--                 WHERE wjso.customer_order_id = pco."id" AND wjso.type ='客户订单预留' AND status ='02confirmed' )-->
<!--                 reserved_quantity_realtime,-->
<!--             bp."id" part_id,-->
<!--             bp.part_name,-->
<!--             bp.unit,-->
<!--             pc.entity_name,-->
<!--             pc.verify_date,-->
<!--               pc.customer_contract_no,-->
<!--               pc.comment,-->
<!--             pc.return_status,-->
<!--               pc.place_order_date,-->
<!--               pc.factory_place_order_date,-->
<!--               pc.original_contract_status,-->
<!--               pc.end_time,-->
<!--               cop.value outerColor,-->
<!--               td.name doc_name,-->
<!--               td.number doc_number,-->
<!--               td.insulation_color,-->
<!--               td.sheath_color-->
<!--          FROM-->
<!--             plan_customer_order pco-->
<!--                 LEFT JOIN plan_customer pc ON pc."id" = pco.customer_id-->
<!--                LEFT JOIN basic_part bp ON bp.part_no = pco.part_no-->
<!--                LEFT JOIN technology_document td ON td.id = pco.technology_document_id-->
<!--                LEFT JOIN plan_customer_order_param cop ON cop.order_id = pco.ID-->
<!--                AND field = 'OuterColor'-->
<!--         ) tempA-->
<!--      <where>-->
<!--         <if test="ew.emptyOfWhere == false">-->
<!--            and ${ew.SqlSegment}-->
<!--         </if>-->
<!--      </where>-->
   </select>

   <select id="getCustomerOrderById" resultType="com.alibaba.fastjson.JSONObject">