Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/mybatis/mapper/inv/InvPlaceOrderDetailDao.xml

@@ -6,23 +6,22 @@
     <select id="selectDetailList" resultType="com.glxp.api.res.inv.InvPlaceOrderDetailResponse">
         SELECT
         a1.count,
-        a2.relId,
+        a1.relId,
-        bp.cpmctymc as productName,
+        bp.cpmctymc AS productName,
         bp.ggxh,
-        a2.batchNo,
+        a1.batchNo,
-        a2.serialNo,
+        a1.serialNo,
         bp.measname,
         bp.zczbhhzbapzbh,
         bp.manufactory,
-        asp.name as invSpaceName,
+        asp.NAME AS invSpaceName,
         bp.nameCode,
-        (select name from basic_corp where erpId = a2.supId)         supName
+        ( SELECT NAME FROM basic_corp WHERE erpId = a1.supId ) supName
         FROM
         inv_place_order_detail a1
-        LEFT JOIN inv_prein_product_detail a2 ON a1.CODE = a2.CODE
+        LEFT JOIN basic_udirel bu ON bu.id = a1.relId
-        LEFT JOIN basic_udirel bu ON bu.id = a2.relId
         LEFT JOIN basic_products bp ON bp.uuid = bu.uuid
-        LEFT JOIN auth_space asp on a1.invSpaceCode=asp.`code`
+        LEFT JOIN auth_space asp ON a1.invSpaceCode = asp.`code`
         <where>
             <if test="recordId != null and recordId != ''">
                 AND a1.recordId = #{recordId}