Merge branch 'refs/heads/dev' into dev_820

mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml

@@ -709,7 +709,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryList" parameterType="com.mhd.oms.domain.businessDocumentOrder.repository.todo.BusinessDocumentOrderDO" resultMap="BusinessDocumentOrderResult">
         <include refid="selectBusinessDocumentOrderPo"/>
         <include refid="selectBusinessDocumentOrderPo1"/>
-        order by create_time desc
+        order by lay_date desc, create_time desc
     </select>
     <select id="selectByMakerCodeNc" parameterType="java.lang.String" resultType="java.lang.String">
             select DOCUMENT_PREPARER_NC_code from NGWL_TEST_USER."USER" where USER_ID = #{salesmanCodeNc}</select>
@@ -1272,4 +1272,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select PUSH_VERIFY from NGWL_TEST_PRODUCT.SYS_ORGANIZATION where ORGANIZATION_ID = #{organizationId}
     </select>
 
+    <select id="countByGoodsNumberPrefix" resultType="java.lang.Integer">
+        SELECT COUNT(1)
+        FROM business_document_order
+        WHERE goods_number LIKE concat(#{prefix}, '%')
+          AND LENGTH(goods_number) &lt;= 12
+    </select>
+
 </mapper>

mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml

@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryList" parameterType="com.mhd.oms.domain.executeOrder.repository.todo.ExecuteOrderDO" resultMap="ExecuteOrderResult">
         <include refid="selectExecuteOrderPo"/>
         <include refid="selectExecuteOrderPo1"/>
-        order by CREATE_TIME desc
+        order by lay_date desc, CREATE_TIME desc
     </select>
     <select id="getOrgNameByOrgId" resultType="java.lang.String">
         select ORGANIZATION_NAME from NGWL_TEST_PRODUCT.SYS_ORGANIZATION where  ORGANIZATION_ID=#{organizationId}

mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml

@@ -33,6 +33,7 @@
         <result property="directWarehouse"    column="direct_warehouse"    />
         <result property="annexUrl"    column="annex_url"    />
         <result property="quantity"    column="quantity"    />
+        <result property="declaredQuantity"    column="declared_quantity"    />
         <result property="planInQuantity"    column="plan_in_quantity"    />
         <result property="receiptQuantity"    column="receipt_quantity"    />
         <result property="shelvesQuantity"    column="shelves_quantity"    />
@@ -136,6 +137,13 @@
 <!--          where sso.in_order_number = a.in_order_number-->
 <!--            and sso.del_flag = 1-->
 <!--        ) as shelves_quantity,-->
+        -- 申报数量：入库单明细表 reservation_in_material_detail 的 DECLARED_QUANTITY 汇总
+        (select ifnull(sum(imd.declared_quantity), 0)
+           from reservation_in_material_detail imd
+          where imd.in_order_number = a.in_order_number
+            and imd.del_flag = 1
+            and (imd.level is null or imd.level = 1)
+        ) as declared_quantity,
         a.weight_limit, a.volume_limit, a.cancel_order, a.cancel_remark, a.cancel_by,a.PICTURE_URL,
         a.cancel_by_name, a.cancel_time, a.close_order, a.close_remark, a.close_by, a.close_by_name, a.close_time, a.remark, a.create_time, a.create_by,
         a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag, a.over_stock_id, a.over_stock_status, a.over_stock_type,