ERP_override.git

main / ERP_override

ERP

概况
操作记录
提交次数
目录
文档
派生
对比

blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-06-14 fb8ec3f6a555f8ca1d02b305b08088d07dd5e709

 north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml

@@ -25,7 +25,7 @@
            if(pd.glass_sort=1,'(外)',if(pd2.glass_sort=pd.glass_sort,'(内)','')),
            pd.detail,
            if( od.bend_radius!='',
                round(od.width*(od.bend_radius-round(sum(t.thicknessCount),2))/od.bend_radius,0),
                round(od.width*(od.bend_radius-round(sum(t.thicknessCount),2))/od.bend_radius,1),
                od.width
              ),
            od.height,

			@@ -25,7 +25,7 @@
			if(pd.glass_sort=1,'(外)',if(pd2.glass_sort=pd.glass_sort,'(内)','')),
			pd.detail,
			if( od.bend_radius!='',
			round(od.width*(od.bend_radius-round(sum(t.thicknessCount),2))/od.bend_radius,0),
			round(od.width*(od.bend_radius-round(sum(t.thicknessCount),2))/od.bend_radius,1),
			od.width
			),
			od.height,