commit for pull

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

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cnbm.packing.mapper.CamlineMapper">
+
+    <resultMap id="ResultMap" type="com.cnbm.packing.vo.ComlinePMPP">
+        <result column="machine_name" property="machineName" />
+        <result column="platform_id" property="platformId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <select id="getByid" resultType="float">
+        select pd.pmpp from process_data pd
+        where pd.arg_name = #{subId}
+        ORDER BY
+            pd.create_time DESC
+        LIMIT 1
+    </select>
+
+    <select id="getPMPPBySubId" resultType="float">
+        SELECT
+            -- tu.`NAME`,-- DMC（就是基板ID/模组ID）
+            -- flr.LAST_UPDATE_TIME,
+            flr.PMPP_FL2
+        FROM
+            ue_flasher_data_raw flr
+            LEFT JOIN e_tracking_unit tu ON flc.mainid = tu.id
+        WHERE
+            flr.PMPP != 0
+            and
+            tu.name=#{subId} -- 查特定基板功率
+        ORDER BY
+            flc.LAST_UPDATE_TIME DESC
+            LIMIT 1
+    </select>
+
+    <select id="getOrderNameBySubId" resultType="string">
+        SELECT
+            eorder.name
+        FROM
+            e_tracking_unit tu
+                LEFT JOIN er_order eorder ON tu.order_id = eorder.id
+        WHERE
+            tu.name=#{subId} -- 依据基板id 查询对应的订单名
+        ORDER BY
+            tu.LAST_UPDATE_TIME DESC
+            LIMIT 1
+    </select>
+
+    <select id="getTodayBoxNum" resultType="java.lang.Integer">
+        select count(1)
+        from t_wo_packaging_box twpb
+        where twpb.CREATE_TIME BETWEEN DATE_FORMAT(NOW(),'%Y-%m-%d 00:00:00') AND DATE_FORMAT(NOW(),'%Y-%m-%d 23:59:59')
+    </select>
+
+
+</mapper>

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

@@ -19,10 +19,31 @@
             <id column="update_time" property="updateTime" />
             <id column="version" property="version" />
     </resultMap>
+    <resultMap id="ResultMap" type="com.cnbm.packing.dto.CompensationPowerXSDTO">
+        <result column="a" property="a" />
+        <result column="b" property="b" />
+    </resultMap>
+
 
     <select id="list" resultType="com.cnbm.packing.dto.WoCompensationPowerDTO">
         select * from t_wo_compensation_power
         order by id asc
     </select>
 
+    <select id="getConffBySubIdAndLineBody" resultMap="ResultMap">
+        select
+            twcp.coefficient_a as a,twcp.coefficient_b as b
+        from t_wo_compensation_power twcp
+        where
+            twcp.valid = 1
+
+          <if test="param.lineBody != null">
+              and twcp.line_body = #{param.lineBody}
+          </if>
+          <if test="param.pmpp != null">
+              and twcp.actl_pmpp_high <![CDATA[ >= ]]> #{param.pmpp} and  twcp.actl_pmpp_low <![CDATA[ <= ]]> #{param.pmpp}
+          </if>
+
+    </select>
+
 </mapper>

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

@@ -28,4 +28,18 @@
         order by id asc
     </select>
 
+    <select id="getPowerLevelByLineBodyAndPMPP" resultMap="WoPowerLevelMap">
+        select
+        *
+        from t_wo_power_level twpl
+        where
+        twpl.valid = 1
+        <if test="param.lineBody != null">
+            and twpl.line_body = #{param.lineBody}
+        </if>
+        <if test="param.pmpp != null">
+            and twpl.pmpp_high <![CDATA[ >= ]]> #{param.pmpp} and  twpl.pmpp_low <![CDATA[ <= ]]> #{param.pmpp}
+        </if>
+    </select>
+
 </mapper>