|
|
@@ -55,4 +55,31 @@ insert into apisql(sqlname,sqlstr,params) values ('getTmrGearList','select * fro
|
|
|
# 新增圈舍下拉框列表数据
|
|
|
insert into apisql(sqlname,sqlstr,params) values ('getPenList','select id,pen from bar where pastureid = ? and enable = 1 and isdelete = 0 and pen is not null group by pen order by sort', 'pastureid');
|
|
|
|
|
|
-ALTER TABLE `tmr` ADD COLUMN `volume_rate` decimal(12,5) NOT NULL COMMENT '撒料机每转体积';
|
|
|
+ALTER TABLE `tmr` ADD COLUMN `volume_rate` decimal(12,5) NOT NULL COMMENT '撒料机每转体积';
|
|
|
+
|
|
|
+
|
|
|
+update apisql SET sqlstr = 'SELECT sort,fname,weight,LENGTH,bcode,ccount,speed,gear,useinbar FROM
|
|
|
+(SELECT
|
|
|
+a.sort,a.fname,a.lweight weight,a.fpid,
|
|
|
+IF(a.useinbartype=0,"转投剩料',
|
|
|
+IF(a.useinbartype=1,'撒','继续饲喂')
|
|
|
+) useinbar,
|
|
|
+CONCAT(a.fbarid) fbarid,
|
|
|
+CONCAT(a.pid) pid,
|
|
|
+b.bcode,b.`length`,c.`ccount`,d.speed,
|
|
|
+#(a.`lweight` / b.length) as l1,
|
|
|
+#(a.`lweight` * f.`volume`) / d.volume_rate as l3,
|
|
|
+#(60 * 60 / 1000 / d.speed) as l4,
|
|
|
+(((a.`lweight` / b.length) * f.`volume`) / d.volume_rate) / (60 * 60 / 1000 / d.speed) AS gear
|
|
|
+FROM
|
|
|
+ downloadplandtl2 a
|
|
|
+ JOIN bar b ON a.`fbarid` = b.`id`
|
|
|
+ JOIN feedp c ON c.`barid` = a.`fbarid`
|
|
|
+ JOIN tmr d ON d.id = ?
|
|
|
+ JOIN feedtemplet f ON c.`ftid` = f.id
|
|
|
+WHERE a.pastureid = ?
|
|
|
+ AND a.pid= ?
|
|
|
+AND (IF(?=0,a.useinbartype IN(0,2),a.useinbartype = 1 ) OR ?='')
|
|
|
+ORDER BY a.sort
|
|
|
+) AS B',params = 'tmrId,pastureid,id,useinbartype,useinbartype'
|
|
|
+wHERE sqlname = 'getDownloadplandt2ListV2' and enable = 1;
|
Yi