commit for pull

ym-packing/src/main/resources/mapper/CamlineMapper.xml

@@ -18,14 +18,12 @@
 
     <select id="getPMPPBySubId" resultType="float">
         SELECT
-            -- tu.`NAME`,-- DMC（就是基板ID/模组ID）
-            -- flr.LAST_UPDATE_TIME,
-            flr.PMPP_FL2
+            flc.PMPP
         FROM
-            ue_flasher_data_raw flr
+            ue_flasher_data_calc flc
             LEFT JOIN e_tracking_unit tu ON flc.mainid = tu.id
         WHERE
-            flr.PMPP != 0
+            flc.PMPP != 0
             and
             tu.name=#{subId} -- 查特定基板功率
         ORDER BY

ym-packing/src/main/resources/mapper/WoPackagingBoxMapper.xml

@@ -37,5 +37,10 @@
         select * from t_wo_packaging_box
         order by id asc
     </select>
+    <update id="updateIsArrivedByBoxNo">
+        update t_wo_packaging_box
+        set is_arrived = #{isArrived,jdbcType=NUMERIC}
+        where BOX_NO = #{boxNo,jdbcType=VARCHAR}
+    </update>
 
 </mapper>

ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml

@@ -24,6 +24,20 @@
         select * from t_wo_packaging_box_substrate
         order by id asc
     </select>
+    <select id="getOneByWoSubstrateId" resultMap="WoPackagingBoxSubstrateMap">
+        select
+        *
+        from t_wo_packaging_box_substrate
+        where
+        valid = 1 and
+        WO_SUBSTRATE_ID = #{woSubstrateId,jdbcType=VARCHAR}
+        limit 1
+    </select>
+    <update id="updatePackagingBoxIdByWoSubstrateId">
+        update t_wo_packaging_box_substrate
+        set PACKAGING_BOX_ID = #{packagingBoxId,jdbcType=VARCHAR}
+        where WO_SUBSTRATE_ID = #{woSubstrateId,jdbcType=VARCHAR}
+    </update>
 
 
 </mapper>