Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
| | |
| | | opd.process_id as flowCardId, |
| | | od.order_id as orderNumber, |
| | | opd.order_sort as productSortNumber, |
| | | IF(LOCATE('中空', ogd.process ) > 0, JSON_UNQUOTE(JSON_EXTRACT(pd.separation, "$.lowE")), 0) as hollowCombineDirection, |
| | | IF(LOCATE('中空', ogd.process ) > 0 and LOCATE('#', pd.separation ), |
| | | REPLACE(JSON_UNQUOTE(JSON_EXTRACT(pd.separation, "$.lowE")),'#',''), |
| | | 0) as hollowCombineDirection, |
| | | opd.o_width as width, |
| | | opd.o_height as height, |
| | | op.glass_thickness as thickness, |