@ -59,7 +59,7 @@
<select id= "listPrByWpId" resultType= "org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity" >
select b.* from MES_QC_PRODUCE_RUN b
where b.MTN_CODE in (select a.MTN_CODE from MES_MAC_TOOL_USE a where a.WP_ID =#{wpId} )
where b.MTN_CODE in (select a.MTN_CODE from MES_MAC_TOOL_USE a where a.WP_ID =#{wpId} )
</select>
<select id= "getBoxInfo" resultType= "org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity" >
@ -68,61 +68,61 @@
from MES_QC_PRODUCE_RUN c where c.mtn_code in (
select a.mtn_code from MES_MAC_TOOL_USE a left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
where b.CATEGORYS = '烘箱设备' and a.WP_ID = #{wpId}
)
and c.WORK_SLOT = '烘箱' order by c.IN_DATE desc
)
and c.WORK_SLOT = '烘箱' order by c.IN_DATE desc
</select>
<select id= "listSlotInfoGr" resultType= "org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO" >
select a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type from (
select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.YP_AREA as area,
sum(b.WORK_QTY*d.YP_AREA) over() as sumArea,a.MTN_CODE, d.PRODUCT_IDENT as prod_ident,c.wo_code,f.material,d.yield_type
from MES_MAC_TOOL_USE a
inner join MES_WORK_PLAN b on a.WP_ID = b.ID
inner join MES_WORK_ORDER c on b.WO_ID = c.ID
inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
inner join DS_PART f on d.PART_CODE = f.PART_CODE
where a.MTN_CODE in (
select a.MTN_CODE from MES_MAC_TOOL_USE a
left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
where a.WP_ID = #{wpId}
<if test= "aTrue==true" >
and b.CATEGORYS = '产线设备'
</if>
)
and a.mtu_index = '1' and b.pps_id = 417
) a group by a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type from (
select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.YP_AREA as area,
sum(b.WORK_QTY*d.YP_AREA) over() as sumArea,a.MTN_CODE, d.PRODUCT_IDENT as prod_ident,c.wo_code,f.material,d.yield_type
from MES_MAC_TOOL_USE a
inner join MES_WORK_PLAN b on a.WP_ID = b.ID
inner join MES_WORK_ORDER c on b.WO_ID = c.ID
inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
inner join DS_PART f on d.PART_CODE = f.PART_CODE
where a.MTN_CODE in (
select a.MTN_CODE from MES_MAC_TOOL_USE a
left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
where a.WP_ID = #{wpId}
<if test= "aTrue==true" >
and b.CATEGORYS = '产线设备'
</if>
)
and a.mtu_index = '1' and b.pps_id = 417
) a group by a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
</select>
<select id= "listSlotInfoList" resultType= "org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO" >
select a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type from (
select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.YP_AREA as area,
sum(b.WORK_QTY*d.YP_AREA) over() as sumArea, a.MTN_CODE, d.PRODUCT_IDENT as prod_ident,c.wo_code,f.material,d.yield_type
from MES_MAC_TOOL_USE a
inner join MES_WORK_PLAN b on a.WP_ID = b.ID
inner join MES_WORK_ORDER c on b.WO_ID = c.ID
inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
inner join DS_PART f on d.PART_CODE = f.PART_CODE
where a.MTN_CODE in (
select a.MTN_CODE from MES_MAC_TOOL_USE a
left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
where a.WP_ID = #{wpId}
<if test= "aTrue==true" >
and b.CATEGORYS = '产线设备'
</if>
) and a.mtu_index = '2' and a.BS_FEI_BA_SET is not null
)a group by a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type from (
select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.YP_AREA as area,
sum(b.WORK_QTY*d.YP_AREA) over() as sumArea, a.MTN_CODE, d.PRODUCT_IDENT as prod_ident,c.wo_code,f.material,d.yield_type
from MES_MAC_TOOL_USE a
inner join MES_WORK_PLAN b on a.WP_ID = b.ID
inner join MES_WORK_ORDER c on b.WO_ID = c.ID
inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
inner join DS_PART f on d.PART_CODE = f.PART_CODE
where a.MTN_CODE in (
select a.MTN_CODE from MES_MAC_TOOL_USE a
left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
where a.WP_ID = #{wpId}
<if test= "aTrue==true" >
and b.CATEGORYS = '产线设备'
</if>
) and a.mtu_index = '2' and a.BS_FEI_BA_SET is not null
)a group by a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
</select>
<select id= "listMacToolUse" resultType= "org.springblade.desk.produce.pojo.entity.MacToolUse" >
select * from MES_MAC_TOOL_USE a
where a.wp_id= #{wpId}
where a.wp_id= #{wpId}
<if test= "aTrue==true" >
and a.finished = false
</if>
@ -149,7 +149,7 @@
<select id= "getByPartCodeAndSubCodeMes" resultType= "org.springblade.desk.dashboard.pojo.entity.DsPartSub" >
select b.*,a.CHILD_PART_CODE as subCode from DS_PART_RELATION a inner join DS_PART_BASICS b
on a.PART_CODE = b.PART_CODE where a.PART_CODE= #{partCode} and a.CHILD_PART_CODE = #{subCode}
on a.PART_CODE = b.PART_CODE where a.PART_CODE= #{partCode} and a.CHILD_PART_CODE = #{subCode}
</select>
<select id= "findByPartCodeAndMemoMes" resultType= "org.springblade.desk.produce.pojo.entity.WorkOrder" >
@ -163,15 +163,15 @@
<select id= "getQcReviewSheetListMes" resultType= "org.springblade.desk.quality.pojo.entity.ReviewSheet" >
select a.rs_code,a.memo,a.unqualified_qty,a.REVIEW_DATE from QA_REVIEW_SHEET a
-- inner join rb_pr_work_check b on a.wc_id = b.wc_id
inner join MES_WORK_PLAN c on a.wp_id=c.id
inner join MES_WORK_ORDER d on c.wo_id=d.id
inner join MES_YIELD_ORDER e on e.id = d.yo_id
where e.part_code = #{partCode} and e.batch_no = #{batchNo}
inner join MES_WORK_PLAN c on a.wp_id=c.id
inner join MES_WORK_ORDER d on c.wo_id=d.id
inner join MES_YIELD_ORDER e on e.id = d.yo_id
where e.part_code = #{partCode} and e.batch_no = #{batchNo}
</select>
<select id= "listByWpiIdMes" resultType= "org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail" >
select *,b.ITEM_NAME as trialItem,b.STANDARD_NAME as trialStandard,b.ID as wpiId from QA_WORK_PLAN_ITEM_DETAIL a
inner join QA_WORK_PLAN_ITEM b on a.WORK_PLAN_ITEM_ID = b.ID where a.WORK_PLAN_ITEM_ID = #{wpiId}
inner join QA_WORK_PLAN_ITEM b on a.WORK_PLAN_ITEM_ID = b.ID where a.WORK_PLAN_ITEM_ID = #{wpiId}
order by a.UPDATE_TIME,a.GAUGE_VALUE1 desc
</select>
@ -201,26 +201,26 @@
<select id= "listSjSlotInfoMes" resultType= "org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO" >
select a.PART_CODE, a.BATCH_NO, a.WORK_QTY as qua, a.area, a.sumArea as totalArea,a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
from (
select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.YP_AREA as area,
sum(b.WORK_QTY*d.YP_AREA) over() as sumArea,
a.MTN_CODE, d.PRODUCT_IDENT as prod_ident,c.wo_code,f.material,d.yield_type from MES_MAC_TOOL_USE a
inner join MES_WORK_PLAN b on a.WP_ID = b.ID
inner join MES_WORK_ORDER c on b.WO_ID = c.ID
inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
inner join DS_PART f on d.part_code = f.part_code
where a.MTN_CODE in(
select a.MTN_CODE from MES_MAC_TOOL_USE a
left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
where a.WP_ID = #{wpId}
<if test= "aTrue==true" >
and b.CATEGORYS = '产线设备'
</if>
<if test= "aTrue==false" >
and (b.CATEGORYS not like '%烘箱%' or b.CATEGORYS is null )
</if>
) and a.mtu_index = '2'
)a group by a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.YP_AREA as area,
sum(b.WORK_QTY*d.YP_AREA) over() as sumArea,
a.MTN_CODE, d.PRODUCT_IDENT as prod_ident,c.wo_code,f.material,d.yield_type from MES_MAC_TOOL_USE a
inner join MES_WORK_PLAN b on a.WP_ID = b.ID
inner join MES_WORK_ORDER c on b.WO_ID = c.ID
inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
inner join DS_PART f on d.part_code = f.part_code
where a.MTN_CODE in(
select a.MTN_CODE from MES_MAC_TOOL_USE a
left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
where a.WP_ID = #{wpId}
<if test= "aTrue==true" >
and b.CATEGORYS = '产线设备'
</if>
<if test= "aTrue==false" >
and (b.CATEGORYS not like '%烘箱%' or b.CATEGORYS is null )
</if>
) and a.mtu_index = '2'
)a group by a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
</select>
@ -228,10 +228,10 @@
select * from MES_WORK_ORDER a inner join MES_YIELD_ORDER b on a.yo_id = b.id and a.yo_id = #{yoId}
</select>
<!-- <select id="getByRfpsIdMesNew" resultType="org.springblade.desk.produce.pojo.entity.MesRbFilePreserveDetailEntity"> -->
<!-- select * from MES_RB_FILE_PRESERVE_DETAIL a inner join MES_RB_FILE_PRESERVE_SLOT b -->
<!-- on a.rfps_id = b.id and a.rfps_id = #{id} and a.IS_DELETED = 0 -->
<!-- </select> -->
<!-- <select id="getByRfpsIdMesNew" resultType="org.springblade.desk.produce.pojo.entity.MesRbFilePreserveDetailEntity"> -->
<!-- select * from MES_RB_FILE_PRESERVE_DETAIL a inner join MES_RB_FILE_PRESERVE_SLOT b -->
<!-- on a.rfps_id = b.id and a.rfps_id = #{id} and a.IS_DELETED = 0 -->
<!-- </select> -->
<select id= "getByRfpsIdMesNew" resultType= "org.springblade.desk.produce.pojo.entity.MesRbFilePreserveDetailEntity" >
@ -252,7 +252,7 @@
<select id= "getDataByWpIdAndIndexList" resultType= "org.springblade.desk.produce.pojo.entity.MacToolUse" >
select a.* from MES_MAC_TOOL_USE a
left join MES_WORK_PLAN wp on a.WP_ID = wp.ID
left join MES_WORK_PLAN wp on a.WP_ID = wp.ID
where a.WP_ID=#{wpId} and a.mtu_index=#{indexNum} order by a.Id
</select>
@ -272,13 +272,13 @@
select a.* from MES_MAC_TOOL_USE a where a.wp_id = #{wpId} and hang_num is not null
</select>
<!-- <select id="getDataByWcIdAndPpsId" resultType="org.springblade.desk.produce.pojo.entity.DsRbFilePreserve"> -->
<!-- select from DS_RB_FILE_PRESERVE a where 1=1 -->
<!-- <if test="wcId != null"> -->
<!-- and a.WC_ID = #{wcId} -->
<!-- </if> -->
<!-- and a.PPS_ID = #{ppsId} and a.LINE = 2 -->
<!-- </select> -->
<!-- <select id="getDataByWcIdAndPpsId" resultType="org.springblade.desk.produce.pojo.entity.DsRbFilePreserve"> -->
<!-- select from DS_RB_FILE_PRESERVE a where 1=1 -->
<!-- <if test="wcId != null"> -->
<!-- and a.WC_ID = #{wcId} -->
<!-- </if> -->
<!-- and a.PPS_ID = #{ppsId} and a.LINE = 2 -->
<!-- </select> -->
<select id= "getDataByWcIdAndPpsId" resultType= "org.springblade.desk.quality.pojo.entity.ProReTemplate" >
select from QA_PRO_RE_TEMPLATE a where 1=1
@ -290,9 +290,9 @@
<select id= "getByRfpsId" resultType= "org.springblade.desk.produce.pojo.dto.MesRbFilePreserveDetailDTO" >
select * ,slot.rfps_type as rfpsType from MES_RB_FILE_PRESERVE_DETAIL a
inner join MES_RB_FILE_PRESERVE_SLOT slot on a.rfps_id = slot.rfp_id
where slot.rfp_id =#{rfpsId}
select * ,slot.rfps_type as rfpsType from MES_RB_FILE_PRESERVE_DETAIL a
inner join MES_RB_FILE_PRESERVE_SLOT slot on a.rfps_id = slot.rfp_id
where slot.rfp_id =#{rfpsId}
</select>
@ -300,7 +300,7 @@
<select id= "getByRfpId" resultType= "org.springblade.desk.produce.pojo.entity.MesRbFilePreserveSlotEntity" >
select a.* from MES_RB_FILE_PRESERVE_SLOT slot
-- left join DS_RB_FILE_PRESERVE slot on a.Id = slot.RFP_ID
inner join QA_PRO_RE_TEMPLATE a on a.Id = slot.RFP_ID
inner join QA_PRO_RE_TEMPLATE a on a.Id = slot.RFP_ID
where slot.RFP_ID =#{rfpId}
</select>
@ -415,8 +415,8 @@
<select id= "afterPlaReceive" resultType= "org.springblade.desk.produce.pojo.entity.WorkPlan" >
select a.*
from mes_work_plan a
inner join mes_work_plan b on a.FRONT_WP_ID = b.WP_ID
inner join mes_WORK_ORDER c on a.WO_ID = c.ID
inner join mes_work_plan b on a.FRONT_WP_ID = b.WP_ID
inner join mes_WORK_ORDER c on a.WO_ID = c.ID
where a.NEXT_WP_ID is null
and b.STATUS = 3
and c.run_status < 15
@ -438,37 +438,38 @@
</select>
<select id= "selectBsSalaryCalculationPage" resultType= "org.springblade.desk.efficiency.pojo.vo.BsSalaryCalculationVO" >
SELECT * FROM (
SELECT
f.WO_CODE AS woCode,
g.PART_CODE AS partCode,
g.PART_NAME AS partName,
f.BATCH_NO AS batchNo,
g.USE_DEPT AS useDept,
g.PLATE AS plate,
i.WC_NAME AS wcName,
e.TS_NAME AS team,
b.NAME AS ppsName,
a.HOUR_QUOTA AS hourQuota,
c.WORK_QTY AS workQty,
d.REAL_NAME AS worker,
k.PRODUCT_TYPE AS productType,
g.PRODUCT_IDENT AS prodIdent,
a.WORK_QTY AS singleBatchNo,
f.inventory_qty AS putQuantity,
f.scrap_qty AS scrapQty,
f.loss_qty AS lossQty,
f.test_qty AS testQty,
g.YP_AREA AS poArea,
a.WORK_QTY * g.YP_AREA AS totalArea,
f.put_store_time AS putStoreTime,
a.WP_MONEY AS wpMoney,
a.BASE_AMOUNT as baseAmount,
a.SUBSIDY_AMOUNT as subsidyAmount,
k.PLATE_THICKNESS as plateThickness,
CASE WHEN a.BASE_AMOUNT IS NULL AND a.SUBSIDY_AMOUNT IS NULL
THEN NULL
ELSE NVL(a.BASE_AMOUNT, 0) + NVL(a.SUBSIDY_AMOUNT, 0)
END AS totalAmount
f.WO_CODE AS woCode,
g.PART_CODE AS partCode,
g.PART_NAME AS partName,
f.BATCH_NO AS batchNo,
g.USE_DEPT AS useDept,
g.PLATE AS plate,
i.WC_NAME AS wcName,
e.TS_NAME AS team,
b.NAME AS ppsName,
a.HOUR_QUOTA AS hourQuota,
c.WORK_QTY AS workQty,
d.REAL_NAME AS worker,
k.PRODUCT_TYPE AS productType,
g.PRODUCT_IDENT AS prodIdent,
a.WORK_QTY AS singleBatchNo,
f.inventory_qty AS putQuantity,
f.scrap_qty AS scrapQty,
f.loss_qty AS lossQty,
f.test_qty AS testQty,
g.YP_AREA AS poArea,
a.WORK_QTY * g.YP_AREA AS totalArea,
f.put_store_time AS putStoreTime,
a.WP_MONEY AS wpMoney,
a.BASE_AMOUNT as baseAmount,
a.SUBSIDY_AMOUNT as subsidyAmount,
k.PLATE_THICKNESS as plateThickness,
CASE WHEN a.BASE_AMOUNT IS NULL AND a.SUBSIDY_AMOUNT IS NULL
THEN NULL
ELSE NVL(a.BASE_AMOUNT, 0) + NVL(a.SUBSIDY_AMOUNT, 0)
END AS totalAmount
FROM MES_WORK_PLAN a
INNER JOIN BS_PROCESS_SET b ON a.PPS_ID = b.ID AND b.IS_DELETED = 0
INNER JOIN MES_MAKE_REC c ON a.ID = c.WP_ID AND c.IS_DELETED = 0
@ -478,7 +479,8 @@
INNER JOIN MES_YIELD_ORDER g ON f.YO_ID = g.ID AND g.IS_DELETED = 0
INNER JOIN BS_CENTER_TEAM h ON e.ID = h.TS_ID AND e.WC_ID = h.WC_ID AND h.IS_DELETED = 0
INNER JOIN BS_WORK_CENTER i ON h.WC_ID = i.ID AND i.IS_DELETED = 0
INNER JOIN DS_PART_VERSION j on g.part_code = j.part_code and g.part_version = j.part_version and j.IS_DELETED = 0
INNER JOIN DS_PART_VERSION j on g.part_code = j.part_code and g.part_version = j.part_version and j.IS_DELETED =
0
INNER JOIN DS_PART k ON j.part_id = k.ID AND k.IS_DELETED = 0
INNER JOIN MES_QUALITY_GRADE l on g.PRODUCT_IDENT = l.QUALITY_GRADE
<where >
@ -554,21 +556,32 @@
</if>
</where>
)
<choose >
<when test= "bsSalaryCalculation.orderByField != null and bsSalaryCalculation.orderByField != ''" >
ORDER BY ${bsSalaryCalculation.orderByField}
<if test= "bsSalaryCalculation.isAsc" > ASC</if>
<if test= "!bsSalaryCalculation.isAsc" > DESC</if>
</when>
<otherwise >
ORDER BY putStoreTime desc
</otherwise>
</choose>
</select>
<select id= "getByCardNoByPlanAll" resultType= "org.springblade.desk.produce.pojo.vo.AllWorkPlanVO" >
SELECT
b.CARD_NO AS cardNo,
b.WO_CODE AS woCode,
b.PART_CODE AS partCode,
b.BATCH_NO AS batchNo,
a.ID AS wpId,
a.orders AS orders,
c.NAME AS ppsName,
a.STATUS AS status
b.CARD_NO AS cardNo,
b.WO_CODE AS woCode,
b.PART_CODE AS partCode,
b.BATCH_NO AS batchNo,
a.ID AS wpId,
a.orders AS orders,
c.NAME AS ppsName,
a.STATUS AS status
FROM
mes_work_plan a
INNER JOIN mes_work_order b ON a.WO_ID = b.ID
LEFT JOIN BS_PROCESS_SET c ON a.PPS_ID = c.ID
mes_work_plan a
INNER JOIN mes_work_order b ON a.WO_ID = b.ID
LEFT JOIN BS_PROCESS_SET c ON a.PPS_ID = c.ID
WHERE a.WO_ID = #{id} AND b.IS_DELETED = 0
ORDER BY a.ORDERS
</select>
maxiangong
5 days ago