|
|
|
|
@ -438,38 +438,37 @@ |
|
|
|
|
</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 |
|
|
|
|
@ -479,8 +478,7 @@ |
|
|
|
|
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> |
|
|
|
|
@ -556,17 +554,6 @@ |
|
|
|
|
</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 |
|
|
|
|
|
maxiangong
24 hours ago