新生成时间长问题修复

11111.sql

@@ -0,0 +1,787 @@
+
+
+CREATE TABLE `bar_sap` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '栏舍id',
+  `pastureid` bigint(20) NOT NULL COMMENT '牧场id',
+  `bcode` varchar(50) DEFAULT NULL COMMENT '栏舍编号',
+  `bname` varchar(200) NOT NULL COMMENT '栏舍名称',
+  `allowratio` int(11) DEFAULT 0 COMMENT '允许误差数',
+  `autozone` int(11) DEFAULT 0 COMMENT '跳转重量域（kg）',
+  `autosecond` int(4) DEFAULT 0 COMMENT '跳转延时值',
+  `autosecondname` varchar(50) DEFAULT NULL COMMENT '跳转延时名称',
+  `isstart` tinyint(1) DEFAULT 1 COMMENT '确认开始',
+  `begintag` int(11) DEFAULT NULL,
+  `endtag` int(11) DEFAULT NULL,
+  `sort` int(11) DEFAULT 0 COMMENT '排序',
+  `enable` tinyint(1) DEFAULT 1 COMMENT '是否启用',
+  `isdelete` tinyint(1) DEFAULT 0 COMMENT '是否删除（0为未删除，1为伪删除）',
+  `backup1` varchar(255) DEFAULT NULL COMMENT '备用1',
+  `backup2` varchar(255) DEFAULT NULL COMMENT '备用2',
+  `AUFNR` varchar(50) DEFAULT NULL COMMENT 'sap牛群订单行号',
+  `class` varchar(50) DEFAULT NULL COMMENT '牛舍类型',
+  `classcode` varchar(50) DEFAULT NULL COMMENT '牛舍类型编码',
+  `cattle` varchar(50) DEFAULT NULL COMMENT '牛群',
+  `cattlecode` varchar(50) DEFAULT NULL COMMENT '牛群编码',
+  `sapCode` varchar(50) DEFAULT NULL,
+  PRIMARY KEY (`id`,`pastureid`) USING BTREE,
+  UNIQUE KEY `bar_bname` (`bname`,`pastureid`) USING BTREE,
+  UNIQUE KEY `bar_bcode` (`bcode`,`pastureid`) USING BTREE,
+  UNIQUE KEY `pastureid` (`pastureid`,`sapCode`)
+) ENGINE=InnoDB AUTO_INCREMENT=4354454795596596571 DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC COMMENT='栏舍';
+
+
+
+CREATE TABLE `cattleorder` (
+  `AUFNR` varchar(20) NOT NULL COMMENT '订单号',
+  `KTEXT` varchar(50) DEFAULT NULL COMMENT '订单描述',
+  `ZNZLX` varchar(50) DEFAULT NULL COMMENT '牛只类型 A-母犊牛 B-母育成牛 C-母青年牛 D-母泌乳牛 E-母干奶牛 F-公牛',
+  `AUART` varchar(50) DEFAULT NULL COMMENT '订单类型编码',
+  `AUTXT` varchar(50) DEFAULT NULL COMMENT '订单类型名称',
+  `BUKRS` varchar(50) DEFAULT NULL COMMENT '公司代码',
+  `BUTXT` varchar(50) DEFAULT NULL COMMENT '公司代码名称',
+  PRIMARY KEY (`AUFNR`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+
+
+CREATE TABLE `dist` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `distType` varchar(30) DEFAULT NULL,
+  `distName` varchar(50) DEFAULT NULL,
+  `distCode` varchar(50) DEFAULT NULL,
+  `remark` varchar(50) DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=321 DEFAULT CHARSET=utf8mb3 ROW_FORMAT=COMPACT;
+
+
+CREATE TABLE `downloadedplan_delrecord` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `pastureid` bigint(20) NOT NULL,
+  `mydate` datetime NOT NULL COMMENT '计划日期',
+  `projname` varchar(12) DEFAULT NULL COMMENT '计划编号',
+  `datacaptureno` int(11) DEFAULT NULL COMMENT '设备编号',
+  `tmrid` bigint(20) DEFAULT NULL COMMENT 'tmr主键',
+  `tmrtname` varchar(20) DEFAULT NULL COMMENT 'tmr名称',
+  `havebutton` tinyint(1) DEFAULT 0 COMMENT '是否开始执行',
+  `inbuttontype` int(11) DEFAULT 0 COMMENT '按钮类型',
+  `plantime` varchar(50) DEFAULT NULL COMMENT '计划时分',
+  `intime` datetime DEFAULT NULL COMMENT '开始执行时间',
+  `completedtime` datetime DEFAULT NULL COMMENT '结束执行时间',
+  `processtime` time DEFAULT NULL COMMENT '过程时间',
+  `iscompleted` tinyint(4) DEFAULT 0 COMMENT '是否已完成',
+  `lpplantype` int(11) DEFAULT 0 COMMENT '计算模式: 0、混合，1、上料，2、发料，3、剩料，4、预混',
+  `times` int(11) DEFAULT 0 COMMENT '班次',
+  `sort` int(11) DEFAULT 0 COMMENT '顺序',
+  `remark` varchar(50) DEFAULT NULL COMMENT '备注',
+  `itemnum` int(11) DEFAULT NULL COMMENT '添加饲料种类数',
+  `outitems` int(11) DEFAULT NULL COMMENT '发料牛舍数',
+  `feedpname` varchar(200) DEFAULT NULL COMMENT '牛舍列表',
+  `feedpcount` int(11) DEFAULT 0 COMMENT '牛头数',
+  `pid` bigint(20) DEFAULT NULL COMMENT '发料计划编号',
+  `tempid` bigint(20) DEFAULT NULL COMMENT '配方id',
+  `templetname` varchar(50) DEFAULT NULL COMMENT '配方模版名称',
+  `ptstempid` bigint(20) DEFAULT NULL COMMENT '补料配方id',
+  `ptstempletname` varchar(50) DEFAULT NULL COMMENT '补料配方模版名称',
+  `thoweight` char(20) DEFAULT NULL COMMENT '配方理论干物质',
+  `fpweight` char(20) DEFAULT NULL COMMENT '配方总重',
+  `lweight` decimal(38,2) DEFAULT NULL COMMENT '应做料总量',
+  `iweight` int(11) DEFAULT NULL COMMENT '实际做料总量',
+  `oweight` int(11) DEFAULT NULL COMMENT '实发料重量',
+  `tversion` int(11) DEFAULT 0 COMMENT '配方版本',
+  `ptversion` int(11) DEFAULT 0 COMMENT '补料配方版本',
+  `enable` tinyint(4) DEFAULT 1 COMMENT '是否启用',
+  `isUse` int(11) DEFAULT 0 COMMENT '是否使用（1 为已使用）格润富德接口使用',
+  `deletetime` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE,
+  KEY `newindex1` (`mydate`) USING BTREE,
+  KEY `newindex2` (`lpplantype`) USING BTREE,
+  KEY `newindex3` (`havebutton`) USING BTREE,
+  KEY `pid` (`pid`) USING BTREE,
+  KEY `downloadedplan_uni` (`pastureid`,`mydate`,`pid`,`lpplantype`,`tmrid`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=3275835 DEFAULT CHARSET=utf8mb3 COMMENT='计划';
+
+
+CREATE TABLE `downloadedplan_log` (
+  `id` bigint(20) NOT NULL DEFAULT 0,
+  `times` tinyint(2) DEFAULT NULL,
+  `date` date DEFAULT NULL,
+  `status` tinyint(1) DEFAULT 0 COMMENT '同步状态',
+  `push_status` tinyint(1) DEFAULT NULL COMMENT '微信推送状态',
+  `classes` tinyint(1) DEFAULT 0 COMMENT '班次状态',
+  `dailyplan` tinyint(1) DEFAULT 0 COMMENT '当日计划',
+  `log` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `date` (`date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+
+
+CREATE TABLE `downloadplandtl1_delrecord` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `pastureid` bigint(20) NOT NULL,
+  `pid` bigint(20) NOT NULL COMMENT '计划id',
+  `flpid` bigint(20) DEFAULT NULL COMMENT '发料计划的主id',
+  `fid` bigint(20) NOT NULL COMMENT '饲料id',
+  `lweight` decimal(10,2) NOT NULL COMMENT '理论重量',
+  `sort` int(11) NOT NULL DEFAULT 0 COMMENT '顺序',
+  `lastactualweight` decimal(10,2) DEFAULT NULL COMMENT '上次重量',
+  `actualweight` decimal(10,2) DEFAULT NULL COMMENT '实际重量',
+  `actualweightminus` decimal(10,2) DEFAULT NULL COMMENT '实际重量',
+  `havebuttom` tinyint(1) DEFAULT 0 COMMENT '是否操作',
+  `begintime` datetime DEFAULT NULL COMMENT '操作开始时间',
+  `intime` datetime DEFAULT NULL COMMENT '操作结束时间',
+  `buttontype` int(11) DEFAULT 0 COMMENT '操作类型',
+  `optdevice` bigint(20) DEFAULT NULL COMMENT '操作车id',
+  `feedcode` varchar(50) DEFAULT NULL COMMENT '饲料编码',
+  `fname` varchar(20) DEFAULT NULL COMMENT '饲料名称',
+  `feedsort` int(11) DEFAULT 0 COMMENT '饲料顺序',
+  `feedallowratio` float DEFAULT 0 COMMENT '饲料允许误差率',
+  `stirdelay` int(11) DEFAULT 0 COMMENT '搅拌延时(分钟)',
+  `fweight` decimal(10,3) DEFAULT NULL COMMENT '配方明细量',
+  `tmrloadname` varchar(20) DEFAULT NULL COMMENT '相同饲料顺序在tmr车上的显示名称',
+  `dryfeed` decimal(38,2) DEFAULT NULL COMMENT '饲料干物质',
+  `pricefeed` decimal(38,2) DEFAULT NULL COMMENT '饲料单价',
+  `outweight` int(11) DEFAULT NULL COMMENT '人工确认出库量',
+  `errratio` decimal(38,2) DEFAULT NULL,
+  `date` date NOT NULL,
+  `buttonsucc` tinyint(4) DEFAULT NULL,
+  `type` tinyint(4) DEFAULT 0 COMMENT '类型 1是tmr 0 是饲料',
+  PRIMARY KEY (`id`,`pastureid`,`date`) USING BTREE,
+  KEY `ai_id` (`id`) USING BTREE,
+  KEY `newindex1` (`fid`) USING BTREE,
+  KEY `fk_downloadplandtl1` (`pid`) USING BTREE,
+  KEY `date` (`date`) USING BTREE,
+  KEY `flpid` (`flpid`) USING BTREE,
+  KEY `downloadplandtl1_uni` (`pastureid`,`flpid`,`fid`,`date`,`pid`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=24611703 DEFAULT CHARSET=utf8mb3 COMMENT='计划1';
+
+
+
+
+CREATE TABLE `downloadplandtl1_exec_delrecord` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `pastureid` bigint(20) NOT NULL,
+  `pid` bigint(20) NOT NULL COMMENT '计划id',
+  `flpid` bigint(20) DEFAULT NULL,
+  `lastactualweight` decimal(10,2) DEFAULT NULL COMMENT '上次重量',
+  `actualweight` decimal(10,2) DEFAULT NULL COMMENT '本次重量',
+  `lweight` decimal(10,2) NOT NULL COMMENT '理论重量',
+  `actualweightminus` decimal(10,2) DEFAULT NULL COMMENT '实际重量',
+  `begintime` datetime DEFAULT NULL COMMENT '操作开始时间',
+  `intime` datetime DEFAULT NULL COMMENT '操作结束时间',
+  `havebuttom` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否已操作',
+  `buttontype` int(11) DEFAULT 0 COMMENT '按钮类型',
+  `optdevice` bigint(20) DEFAULT NULL COMMENT '操作车id',
+  `sort` int(11) NOT NULL DEFAULT 0 COMMENT '顺序',
+  `fname` varchar(50) DEFAULT NULL COMMENT '饲料名称,多饲料，逗号分开',
+  `fcount` int(11) DEFAULT NULL COMMENT '饲料数',
+  `tmrloadname` varchar(20) DEFAULT NULL COMMENT '相同饲料顺序在tmr车上的显示名称',
+  `feedallowratio` float DEFAULT 0 COMMENT '饲料允许误差公斤',
+  `processtime` time DEFAULT NULL COMMENT '过程时间',
+  `stirdelay` int(11) DEFAULT 0 COMMENT '搅拌延时(分钟)',
+  `buttonsucc` tinyint(4) DEFAULT 0,
+  `errratio` decimal(38,2) DEFAULT NULL,
+  `date` date NOT NULL,
+  `type` tinyint(4) DEFAULT 0 COMMENT '类型 1是tmr 0 是饲料',
+  PRIMARY KEY (`id`,`pastureid`,`date`) USING BTREE,
+  KEY `ai_id` (`id`) USING BTREE,
+  KEY `fk_downloadplandtl1_exec` (`pid`) USING BTREE,
+  KEY `p-pid` (`pastureid`,`pid`) USING BTREE,
+  KEY `date` (`date`,`pastureid`) USING BTREE,
+  KEY `intime` (`intime`,`pastureid`) USING BTREE,
+  KEY `flpid` (`flpid`) USING BTREE,
+  KEY `downloadplandtl1_exec_sort` (`pastureid`,`pid`,`sort`,`date`,`type`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=24611703 DEFAULT CHARSET=utf8mb3 COMMENT='计划1_exec';
+
+
+
+
+
+CREATE TABLE `downloadplandtl1_log` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `sort` int(11) DEFAULT NULL,
+  `planid` bigint(20) DEFAULT NULL COMMENT 'downloadedplan id ',
+  `pastureid` int(11) DEFAULT NULL,
+  `date` date DEFAULT NULL,
+  `plandtl1` bigint(20) DEFAULT NULL COMMENT 'downloadplandtl1 id ',
+  `type` tinyint(1) DEFAULT NULL,
+  `InventoryWarning` tinyint(1) DEFAULT NULL,
+  `abnormalMixingDelay` tinyint(1) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=110179 DEFAULT CHARSET=utf8mb4;
+
+
+
+CREATE TABLE `downloadplandtl2_delrecord` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `pastureid` bigint(20) NOT NULL,
+  `pid` bigint(20) NOT NULL COMMENT '计划id',
+  `flpid` bigint(20) DEFAULT NULL COMMENT ',发料计划的主id',
+  `fbarid` bigint(20) NOT NULL COMMENT '牛舍id',
+  `fname` varchar(50) DEFAULT NULL COMMENT '牛舍名称',
+  `lastactualweight` decimal(10,0) DEFAULT NULL COMMENT '上次重量',
+  `actualweight` decimal(10,2) DEFAULT NULL COMMENT '本次重量',
+  `lweight` decimal(10,2) DEFAULT NULL COMMENT '理论重量',
+  `lweighthis` decimal(10,2) DEFAULT NULL COMMENT '历史理论重量（剩料）',
+  `remainleftw` decimal(10,2) DEFAULT NULL COMMENT '剩料量',
+  `allowrw` decimal(10,2) DEFAULT NULL COMMENT '允许分配剩料量',
+  `actualweightminus` decimal(10,2) DEFAULT NULL COMMENT '实际重量',
+  `sort` int(11) NOT NULL DEFAULT 0 COMMENT '顺序',
+  `havebuttom` tinyint(1) DEFAULT 0 COMMENT '是否操作',
+  `begintime` datetime DEFAULT NULL COMMENT '操作开始时间',
+  `begintag` varchar(50) DEFAULT NULL COMMENT '开始标签',
+  `intime` datetime DEFAULT NULL COMMENT '操作完成时间',
+  `endtag` varchar(50) DEFAULT NULL COMMENT '结束标签',
+  `buttontype` int(11) DEFAULT 0 COMMENT '操作按键类型',
+  `optdevice` bigint(20) DEFAULT NULL COMMENT '操作车id',
+  `cowcount` int(11) DEFAULT 0 COMMENT '牛头数',
+  `cowclassid` bigint(20) DEFAULT NULL COMMENT '牛只类型id',
+  `cowclassname` varchar(50) DEFAULT NULL COMMENT '类型名称',
+  `bigcowname` varchar(50) DEFAULT NULL,
+  `pweight` decimal(10,2) DEFAULT NULL COMMENT '通过加料计算出重量',
+  `ccountratio` float DEFAULT 100 COMMENT '牛头系数',
+  `sumrtime` float DEFAULT 0 COMMENT '该班次比例(%)',
+  `feedtempletid` bigint(20) DEFAULT NULL COMMENT '配方模版id',
+  `feedtempletname` varchar(20) DEFAULT NULL COMMENT '配方模版名称',
+  `dryweight` decimal(10,2) DEFAULT NULL COMMENT '配方干物质',
+  `sumweight` decimal(10,2) DEFAULT NULL COMMENT '配方饲料总重量',
+  `priceweight` decimal(10,2) DEFAULT NULL COMMENT '配方单价',
+  `processtime` time DEFAULT NULL COMMENT '过程时间',
+  `fpid` bigint(20) DEFAULT NULL COMMENT '栏舍配方id',
+  `useinbartype` bigint(20) DEFAULT NULL COMMENT '转投栏舍类型(0收集剩料,1撒剩料)',
+  `date` date NOT NULL,
+  `allowratio` int(11) DEFAULT NULL COMMENT '栏舍允许误差',
+  `errratio` decimal(38,2) DEFAULT NULL,
+  `buttonsucc` tinyint(4) DEFAULT NULL,
+  `type` tinyint(4) DEFAULT 0 COMMENT '类型 1是铲车 0 是栏舍',
+  PRIMARY KEY (`id`,`pastureid`,`date`) USING BTREE,
+  KEY `ai_id` (`fbarid`) USING BTREE,
+  KEY `newindex2` (`flpid`) USING BTREE,
+  KEY `newindex1` (`pid`) USING BTREE,
+  KEY `intime` (`intime`) USING BTREE,
+  KEY `date` (`date`) USING BTREE,
+  KEY `pastureid` (`pastureid`,`pid`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=13146290 DEFAULT CHARSET=utf8mb3 COMMENT='计划2';
+
+
+
+CREATE TABLE `feed_detail_version` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键自增id',
+  `pasture_id` bigint(20) unsigned NOT NULL COMMENT '牧场id',
+  `feed_template_id` bigint(20) unsigned NOT NULL DEFAULT 0 COMMENT '配方id',
+  `group_version` int(11) unsigned NOT NULL DEFAULT 0 COMMENT '版本号',
+  `belong` tinyint(1) unsigned NOT NULL DEFAULT 1 COMMENT '配方归属 0 无效 1 归属集团端 2 归属牧场端',
+  `created_at` bigint(20) NOT NULL DEFAULT 0 COMMENT '创建时间',
+  `updated_at` bigint(20) NOT NULL DEFAULT 0 COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_feed_template_id` (`feed_template_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配方版本更新记录表';
+
+
+CREATE TABLE `feed_detail_version_log` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键自增id',
+  `pasture_id` bigint(20) unsigned NOT NULL COMMENT '牧场id',
+  `version_id` int(11) unsigned NOT NULL COMMENT 'feed_detail_version表id',
+  `feed_template_id` bigint(20) unsigned NOT NULL COMMENT '配方id',
+  `forage_id` int(11) unsigned NOT NULL COMMENT '饲料id',
+  `forage_name` varchar(255) NOT NULL DEFAULT '' COMMENT '饲料名称',
+  `forage_group_name` varchar(155) NOT NULL DEFAULT '' COMMENT '饲料分组名称',
+  `weight` int(11) unsigned NOT NULL COMMENT '重量',
+  `stir_delay` int(11) unsigned NOT NULL COMMENT '搅拌延迟',
+  `allow_error` int(11) unsigned NOT NULL COMMENT '允许误差',
+  `is_modify` tinyint(1) unsigned NOT NULL DEFAULT 1 COMMENT '是否可修改 0 无效 1 是 2 否',
+  `is_lock_cow_count_ratio` tinyint(1) unsigned NOT NULL DEFAULT 2 COMMENT '是否锁定牛头数比例 1 是 2 否',
+  `sort` int(11) unsigned NOT NULL DEFAULT 0 COMMENT '排序',
+  `is_show` tinyint(1) unsigned NOT NULL DEFAULT 1 COMMENT '是否删除 0 无效 1 未删除 2 已删除',
+  `created` datetime NOT NULL COMMENT '创建时间',
+  `updated` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_feed_template_id` (`feed_template_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='集团端最新配方详情表';
+
+
+CREATE TABLE `feedphistory` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `pastureid` bigint(20) NOT NULL,
+  `barname` char(20) DEFAULT NULL,
+  `barid` bigint(20) NOT NULL COMMENT '舍栏id',
+  `softccount` int(11) DEFAULT NULL COMMENT '软件牛头数',
+  `ccount` int(11) NOT NULL DEFAULT 0 COMMENT '实际头数',
+  `ratio` decimal(38,2) DEFAULT NULL COMMENT '系数',
+  `ccountratio` decimal(38,2) DEFAULT 100.00 COMMENT '系数牛头数',
+  `ftid` bigint(20) DEFAULT NULL COMMENT '配方模版id(不是补料模版的id)',
+  `ftname` varchar(50) DEFAULT NULL COMMENT '配方名称',
+  `ptsfid` bigint(20) DEFAULT NULL COMMENT '配方模版id(补料模版的id)',
+  `ptsfname` varchar(50) DEFAULT NULL COMMENT '补料名称',
+  `feedweight` decimal(38,3) DEFAULT NULL COMMENT '投喂量',
+  `ftweight` decimal(38,3) DEFAULT NULL COMMENT '配方重量',
+  `supplyweight` decimal(38,3) DEFAULT 0.000 COMMENT '补料重量',
+  `owner` varchar(20) DEFAULT NULL COMMENT '编制人',
+  `createdate` datetime DEFAULT NULL,
+  `userId` varchar(30) DEFAULT NULL COMMENT '修改用户',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=3976043477267438868 DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC COMMENT='栏舍';
+
+
+CREATE TABLE `feedtemplethistory` (
+  `id` bigint(20) NOT NULL COMMENT '配方模板id',
+  `pastureid` bigint(20) NOT NULL,
+  `tcode` varchar(50) DEFAULT NULL COMMENT '配方编码',
+  `tname` varchar(50) NOT NULL COMMENT '配方名称',
+  `tcolor` varchar(50) DEFAULT '#ccc' COMMENT '配方模板颜色',
+  `ccid` bigint(20) DEFAULT NULL COMMENT '牲畜类别id',
+  `ccname` varchar(50) DEFAULT NULL COMMENT '类别名称',
+  `fttype` varchar(50) DEFAULT NULL COMMENT '配方类型',
+  `fttypeid` tinyint(1) DEFAULT 0 COMMENT '配方类型id(1饲喂，2预混，3补料)',
+  `source` varchar(50) DEFAULT NULL COMMENT '来源',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  `enable` tinyint(1) DEFAULT 1 COMMENT '启用',
+  `sort` int(11) DEFAULT 1 COMMENT '排序',
+  `owner` varchar(50) DEFAULT NULL COMMENT '来源',
+  `weight` decimal(38,3) DEFAULT NULL COMMENT '总重',
+  `dryweight` decimal(38,3) DEFAULT NULL COMMENT '干物质含量',
+  `isdelete` tinyint(1) DEFAULT 0 COMMENT '是否删除（0为未删除，1为伪删除）',
+  `version` int(11) DEFAULT 1 COMMENT '修改一次增加版本号',
+  `savetime` datetime DEFAULT current_timestamp() COMMENT '保存日期',
+  `isissue` tinyint(4) DEFAULT 0 COMMENT '下发是否为当前配方（1是，0否）',
+  `issueversion` int(11) DEFAULT 0 COMMENT '下发时的版本',
+  `issueid` bigint(20) DEFAULT NULL COMMENT '下发时的id',
+  `backup1` varchar(255) DEFAULT NULL COMMENT '备用1',
+  `backup2` varchar(255) DEFAULT NULL COMMENT '备用2',
+  `createdate` datetime DEFAULT NULL,
+  `volume` decimal(12,2) NOT NULL DEFAULT 0.00 COMMENT '容积',
+  `userId` varchar(30) DEFAULT NULL COMMENT '修改用户'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+
+
+
+
+CREATE TABLE `fit_history` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) DEFAULT NULL COMMENT '饲料名称',
+  `weight` decimal(10,2) DEFAULT NULL COMMENT '修改前重量',
+  `pastureId` bigint(20) DEFAULT NULL COMMENT '牧场id',
+  `fitId` bigint(20) DEFAULT NULL COMMENT '配方id',
+  `dateTime1` datetime DEFAULT NULL COMMENT '修改时间',
+  `Eweight` decimal(10,2) DEFAULT NULL COMMENT '修改后重量',
+  `change` varchar(20) DEFAULT NULL COMMENT '判断是否改变',
+  `autosecond` int(11) DEFAULT NULL,
+  `preftid` bigint(20) DEFAULT 0,
+  `feedgroup` varchar(50) DEFAULT NULL,
+  `userId` varchar(30) DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=23382 DEFAULT CHARSET=utf8mb3;
+
+
+
+CREATE TABLE `fpdetailhistory` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '配方子表id',
+  `pastureid` bigint(20) NOT NULL,
+  `barid` bigint(20) NOT NULL COMMENT '栏舍id',
+  `barname` varchar(50) DEFAULT NULL COMMENT '栏舍名称',
+  `times` tinyint(4) DEFAULT NULL COMMENT '班次',
+  `tratio` decimal(38,1) DEFAULT NULL COMMENT '班次比例',
+  `weight` decimal(38,2) unsigned DEFAULT 0.00 COMMENT '重量',
+  `ptsrate` decimal(38,6) unsigned zerofill DEFAULT 00000000000000000000000000000000.000000 COMMENT '补料比例',
+  `cowcount` char(20) DEFAULT NULL COMMENT '牛头数',
+  `ccountradio` char(20) DEFAULT NULL COMMENT '牛头系数',
+  `ptid` bigint(20) DEFAULT -1 COMMENT '配方模板',
+  `ptsid` bigint(20) DEFAULT -1 COMMENT '补料配方',
+  `ptuse` decimal(38,2) unsigned NOT NULL DEFAULT 0.00 COMMENT '0 未分配 大于0分配',
+  `ptsuse` decimal(38,2) unsigned NOT NULL DEFAULT 0.00 COMMENT '0 未分配 大于0分配',
+  `supplement` decimal(38,2) DEFAULT 0.00,
+  `createdate` datetime DEFAULT NULL,
+  `userId` varchar(30) DEFAULT NULL COMMENT '修改用户',
+  PRIMARY KEY (`id`,`pastureid`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=3976043477519271054 DEFAULT CHARSET=utf8mb3 COMMENT='栏舍配方子表历史记录';
+
+
+CREATE TABLE `ftdry_history` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `barname` varchar(50) DEFAULT NULL COMMENT '栏舍名称',
+  `times` varchar(50) DEFAULT NULL COMMENT '班次',
+  `freshweight` decimal(20,2) DEFAULT NULL COMMENT '新鲜重量',
+  `dryweight` decimal(20,2) DEFAULT NULL COMMENT '烘干重量',
+  `thoweight` decimal(20,0) DEFAULT NULL COMMENT '理论干物质',
+  `actweight` decimal(20,0) DEFAULT NULL COMMENT '实际干物质',
+  `barid` bigint(20) DEFAULT NULL COMMENT '栏舍id',
+  `changeTime` datetime DEFAULT NULL COMMENT '操作时间',
+  `pastureid` bigint(20) DEFAULT NULL COMMENT '牧场id',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=56 DEFAULT CHARSET=utf8mb3;
+
+
+CREATE TABLE `log` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `method` varchar(255) DEFAULT NULL,
+  `status` varchar(255) DEFAULT NULL,
+  `data` longtext DEFAULT NULL,
+  `date` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb3;
+
+
+CREATE TABLE `lpplandtl1history` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '发料计划详情',
+  `pastureid` bigint(20) NOT NULL,
+  `lppid` bigint(20) DEFAULT NULL COMMENT '计划id',
+  `barid` bigint(20) DEFAULT NULL COMMENT '栏舍id',
+  `barname` varchar(50) DEFAULT NULL COMMENT '栏舍名称',
+  `fpdid` bigint(20) DEFAULT NULL COMMENT '栏舍配方子id',
+  `fttype` tinyint(4) DEFAULT 1 COMMENT '配方类型（1饲喂，0补料）',
+  `lweight` decimal(10,2) unsigned DEFAULT NULL COMMENT '重量',
+  `sort` int(11) DEFAULT 0 COMMENT '顺序',
+  `tmrid` bigint(20) DEFAULT NULL COMMENT '撒料车id',
+  `tmrname` varchar(50) DEFAULT NULL COMMENT '撒料车名称',
+  `background` varchar(50) DEFAULT NULL COMMENT '颜色',
+  `cowcount` int(11) DEFAULT NULL COMMENT '牛头数',
+  `ccountradio` decimal(38,2) DEFAULT NULL COMMENT '牛头系数',
+  `lweighthis` decimal(10,2) DEFAULT NULL,
+  `createdate` datetime DEFAULT NULL,
+  `userId` varchar(30) DEFAULT NULL COMMENT '修改用户',
+  PRIMARY KEY (`id`,`pastureid`) USING BTREE,
+  KEY `fpdid` (`fpdid`) USING BTREE,
+  KEY `lppid` (`lppid`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=3932719861084108929 DEFAULT CHARSET=utf8mb3;
+
+
+
+
+CREATE TABLE `pennsieve_history` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `barname` varchar(50) DEFAULT NULL COMMENT '栏舍名称',
+  `times` varchar(50) DEFAULT NULL COMMENT '班次',
+  `onerate` decimal(20,2) DEFAULT NULL COMMENT '第一层比例',
+  `oneweight` decimal(20,2) DEFAULT NULL COMMENT '第一层重量',
+  `tworate` decimal(20,2) DEFAULT NULL COMMENT '第二层比列',
+  `twoweight` decimal(20,2) DEFAULT NULL COMMENT '第二层重量',
+  `threerate` decimal(20,2) DEFAULT NULL COMMENT '第三层比列',
+  `threeweight` decimal(20,2) DEFAULT NULL COMMENT '第三层重量',
+  `fourrate` decimal(20,2) DEFAULT NULL COMMENT '第四层比列',
+  `fourweight` decimal(20,2) DEFAULT NULL COMMENT '第四层重量',
+  `operatetime` datetime DEFAULT NULL COMMENT '操作时间',
+  `barid` bigint(20) DEFAULT NULL COMMENT '栏舍id',
+  `pastureid` bigint(20) DEFAULT NULL COMMENT '牧场id',
+  `species` varchar(50) DEFAULT NULL COMMENT '种类',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=52 DEFAULT CHARSET=utf8mb3;
+
+
+CREATE TABLE `pushing` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `pastureid` bigint(20) NOT NULL,
+  `barid` bigint(20) DEFAULT NULL,
+  `barname` varchar(50) DEFAULT NULL,
+  `tmrid` bigint(20) DEFAULT NULL,
+  `tmrname` varchar(50) DEFAULT NULL,
+  `tmrcode` varchar(50) DEFAULT NULL,
+  `allowableerror` int(5) DEFAULT NULL COMMENT '误差时间',
+  `enable` tinyint(1) DEFAULT NULL,
+  PRIMARY KEY (`id`,`pastureid`) USING BTREE,
+  UNIQUE KEY `pastureid` (`pastureid`,`barid`) USING BTREE,
+  KEY `id` (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 COMMENT='推料计划';
+
+CREATE TABLE `pushing_history` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `pastureid` bigint(20) NOT NULL,
+  `barid` bigint(20) DEFAULT NULL,
+  `barname` varchar(50) DEFAULT NULL,
+  `tmrid` bigint(20) DEFAULT NULL,
+  `tmrname` varchar(50) DEFAULT NULL,
+  `tmrcode` varchar(50) DEFAULT NULL,
+  `allowableerror` int(5) DEFAULT NULL COMMENT '误差时间',
+  `tisms` varchar(100) DEFAULT NULL,
+  `createTime` datetime DEFAULT NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`,`pastureid`) USING BTREE,
+  KEY `createTime` (`createTime`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=57 DEFAULT CHARSET=utf8mb4 COMMENT='推料计划历史记录';
+
+
+CREATE TABLE `pushingdetail` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `pastureid` bigint(20) NOT NULL,
+  `date` time DEFAULT NULL,
+  `pushingid` bigint(20) NOT NULL,
+  PRIMARY KEY (`id`,`pastureid`) USING BTREE,
+  KEY `pushingid` (`pushingid`) USING BTREE,
+  CONSTRAINT `pushingdetail_ibfk_1` FOREIGN KEY (`pushingid`) REFERENCES `pushing` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=133 DEFAULT CHARSET=utf8mb4 COMMENT='推料计划详情';
+
+
+
+CREATE TABLE `remainplanrecord` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `pastureid` bigint(20) DEFAULT NULL,
+  `eqname` varchar(50) DEFAULT NULL COMMENT '设备名称',
+  `eqcode` varchar(50) DEFAULT NULL COMMENT '设备编码',
+  `tclassid` int(11) DEFAULT NULL COMMENT '设备类型',
+  `tclassname` varchar(50) DEFAULT NULL,
+  `barid` bigint(20) DEFAULT NULL COMMENT '栏舍',
+  `barname` varchar(50) DEFAULT NULL,
+  `createtime` datetime DEFAULT NULL COMMENT '收集时间',
+  `weight` decimal(38,2) DEFAULT NULL COMMENT '重量',
+  `beginweight` decimal(38,2) DEFAULT NULL COMMENT '开始重量',
+  `endweight` decimal(38,2) DEFAULT NULL COMMENT '结束重量',
+  `driver` varchar(30) DEFAULT NULL COMMENT '司机',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3;
+
+
+CREATE TABLE `remind` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `message` varchar(100) DEFAULT NULL,
+  `trigger` varchar(100) DEFAULT NULL COMMENT '触发',
+  `pastureid` int(11) NOT NULL,
+  `user` longtext NOT NULL,
+  `function` varchar(100) DEFAULT NULL,
+  `service_id` int(3) DEFAULT NULL COMMENT '返回得类型id',
+  PRIMARY KEY (`id`,`pastureid`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4;
+
+
+CREATE TABLE `resetplan` (
+  `id` bigint(20) NOT NULL,
+  `sort` int(11) NOT NULL DEFAULT 0,
+  `status` tinyint(1) NOT NULL DEFAULT 0,
+  `mydate` datetime NOT NULL,
+  `plansort` int(11) DEFAULT 0,
+  `lastsort` int(11) DEFAULT 0,
+  `lastweight` decimal(12,4) DEFAULT NULL,
+  `weight` decimal(12,4) DEFAULT 0.0000,
+  `datacaptureno` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `id` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+
+
+
+CREATE TABLE `saplog` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `pastureId` varchar(20) DEFAULT NULL,
+  `request` longtext DEFAULT NULL,
+  `response` longtext DEFAULT NULL,
+  `status` varchar(20) DEFAULT NULL,
+  `msgtext` varchar(255) DEFAULT NULL,
+  `url` varchar(255) DEFAULT NULL,
+  `createTime` datetime DEFAULT NULL ON UPDATE current_timestamp(),
+  `msgtype` int(1) DEFAULT NULL COMMENT '0饲喂  1剩料  2原料  3栏舍  4配方 5栏舍牛头数 6库存',
+  `dataDate` varchar(20) DEFAULT NULL COMMENT '数据日期',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2526 DEFAULT CHARSET=utf8mb3;
+
+
+
+CREATE TABLE `scheduled` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `sname` varchar(50) DEFAULT NULL COMMENT '任务名称',
+  `action` int(11) DEFAULT NULL COMMENT '触发条件 0 上传 1 下载',
+  `childid` int(11) DEFAULT NULL COMMENT '上传任务表id',
+  `times` varchar(5) DEFAULT '0' COMMENT '触发周期 0 每车次结束 1 每班次结束  2 每天计划完成后',
+  `enable` varchar(5) DEFAULT '0' COMMENT '自动同步启用状态 0启用  1关闭',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8mb4 COMMENT='定时任务';
+
+
+CREATE TABLE `scheduled_down` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `datatype` int(11) DEFAULT NULL COMMENT '数据类型（饲料、配方、栏舍.....）',
+  `company` varchar(50) DEFAULT NULL COMMENT '公司',
+  `addres` varchar(255) DEFAULT NULL COMMENT 'api地址',
+  `adressparam` varchar(100) DEFAULT NULL COMMENT 'api的入参（待商议）',
+  `targetdata` varchar(100) DEFAULT NULL COMMENT '解剖原数据获取目标数据',
+  `manual` tinyint(1) DEFAULT 0,
+  `methods` varchar(50) DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='任务-下发数据';
+
+
+
+CREATE TABLE `scheduled_down_child` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `parentid` int(11) DEFAULT NULL COMMENT 'scheduled_down表id',
+  `fieldname` varchar(50) DEFAULT NULL COMMENT '字段名称',
+  `checksql` varchar(100) DEFAULT NULL COMMENT '验证sql',
+  `dosql` varchar(150) DEFAULT NULL COMMENT '执行sql',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='任务-下发子表';
+
+
+
+CREATE TABLE `scheduled_up` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `company` varchar(50) DEFAULT NULL COMMENT '公司',
+  `addres` varchar(50) DEFAULT NULL COMMENT 'api地址',
+  `datatype` int(11) DEFAULT NULL COMMENT '数据类型（栏舍、配方、搅拌、发料...）',
+  `package` text DEFAULT NULL COMMENT '数据的外层包裹',
+  `datasql` text DEFAULT NULL COMMENT '执行sql',
+  `automatic` tinyint(1) DEFAULT 0,
+  `manual` tinyint(1) DEFAULT 0,
+  `targetdata` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COMMENT='任务-上传数据';
+
+
+
+CREATE TABLE `surplus` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `pastureId` int(11) DEFAULT NULL,
+  `surplus` varchar(50) DEFAULT NULL,
+  `feedId` bigint(20) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `surplus` (`surplus`)
+) ENGINE=InnoDB AUTO_INCREMENT=172 DEFAULT CHARSET=utf8mb3;
+
+
+
+CREATE TABLE `templetdry` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `templetId` varchar(100) DEFAULT NULL COMMENT '配方主键',
+  `cdate` date DEFAULT NULL COMMENT '日期',
+  `tdry` decimal(10,2) DEFAULT NULL COMMENT '干物质',
+  `tprice` float DEFAULT 0 COMMENT '价格',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=47088 DEFAULT CHARSET=utf8mb3 COMMENT='配方干物质';
+
+
+
+CREATE TABLE `tmr_equipment` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `tmrId` bigint(20) DEFAULT NULL COMMENT '设备id',
+  `pastureId` bigint(20) DEFAULT NULL COMMENT '关联牧场',
+  `date` time DEFAULT NULL COMMENT '时间',
+  `remark` varchar(100) DEFAULT NULL COMMENT '备注',
+  `enable` tinyint(4) DEFAULT NULL COMMENT '是否启用',
+  `barId` varchar(200) DEFAULT NULL COMMENT '设备类型id',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=83 DEFAULT CHARSET=utf8mb3;
+
+
+CREATE TABLE `tmr_equipment_date` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `tmrId` bigint(20) DEFAULT NULL COMMENT '设备id',
+  `pastureId` bigint(20) DEFAULT NULL COMMENT '关联牧场',
+  `date` time DEFAULT NULL COMMENT '时间',
+  `remark` varchar(100) DEFAULT NULL COMMENT '备注',
+  `enable` tinyint(4) DEFAULT NULL COMMENT '是否启用',
+  `barId` varchar(200) DEFAULT NULL COMMENT '设备类型id',
+  `plandate` date NOT NULL,
+  `startdate` datetime DEFAULT NULL,
+  `enddate` datetime DEFAULT NULL,
+  `pid` bigint(20) DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE KEY `plandate` (`plandate`,`pid`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=286 DEFAULT CHARSET=utf8mb3;
+
+
+CREATE TABLE `tmr_equipment_muster` (
+  `pid` int(11) DEFAULT NULL,
+  `gptjson` longtext DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+
+
+CREATE TABLE `tmr_gear` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `tmrId` int(11) NOT NULL,
+  `gear` varchar(30) DEFAULT NULL COMMENT '档位',
+  `rev` int(11) DEFAULT NULL COMMENT '转速/分钟',
+  `volume` decimal(12,5) DEFAULT NULL COMMENT '每转体积',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+
+
+ALTER TABLE `bar` 
+ADD COLUMN   `AUFNR` varchar(50) DEFAULT NULL COMMENT 'sap牛群订单行号',
+ADD COLUMN   `class` varchar(50) DEFAULT NULL COMMENT '牛舍类型',
+ADD COLUMN   `classcode` varchar(50) DEFAULT NULL COMMENT '牛舍类型编码',
+ADD COLUMN   `cattle` varchar(50) DEFAULT NULL COMMENT '牛群',
+ADD COLUMN   `cattlecode` varchar(50) DEFAULT NULL COMMENT '牛群编码',
+ADD COLUMN   `sapCode` varchar(50) DEFAULT NULL,
+ADD COLUMN   `udcode` varchar(50) DEFAULT NULL,
+ADD COLUMN   `udname` varchar(50) DEFAULT NULL,
+ADD COLUMN   `length` decimal(12,0) NOT NULL DEFAULT 0 COMMENT '栏舍长度',
+ADD COLUMN   `pen` varchar(30) DEFAULT NULL COMMENT '圈舍';
+
+ALTER TABLE `barfeedremain` 
+ ADD COLUMN   `dry` decimal(12,2) DEFAULT NULL COMMENT '干物质';
+
+
+
+  ALTER TABLE `downloadedplan` 
+   ADD COLUMN    `oldtmrid` bigint(20) DEFAULT NULL,
+  ADD COLUMN    `driverId` bigint(20) DEFAULT NULL COMMENT '驾驶员',
+  ADD COLUMN     `artificial` tinyint(1) NOT NULL DEFAULT 0 COMMENT '1 为手动完成';
+
+
+
+  
+ 
+ ALTER TABLE `downloadedplan` 
+   ADD COLUMN    `oldtmrid` bigint(20) DEFAULT NULL,
+  ADD COLUMN    `driverId` bigint(20) DEFAULT NULL COMMENT '驾驶员',
+  ADD COLUMN     `artificial` tinyint(1) NOT NULL DEFAULT 0 COMMENT '1 为手动完成';
+	
+    
+    ALTER TABLE `downloadplandtl1` 
+      ADD COLUMN   `deviation` int(11) DEFAULT NULL COMMENT '搅拌延时值允许延时偏差',
+      ADD COLUMN    `xxwFeedCode` varchar(100) DEFAULT NULL;
+      
+		
+			
+	 ALTER TABLE `downloadplandtl1_exec` 
+	 ADD COLUMN 	  `deviation` int(11) DEFAULT NULL COMMENT '搅拌延时值允许延时偏差',
+  ADD COLUMN  `xxwFeedCode` varchar(100) DEFAULT NULL,
+   ADD COLUMN  `surplus` decimal(10,2) DEFAULT NULL COMMENT '剩料重量';
+
+
+ ALTER TABLE `downloadplandtl2` 
+	 ADD COLUMN 	`xxwTempletCode` varchar(100) DEFAULT NULL,
+  ADD COLUMN  `xxwBarCode` varchar(100) DEFAULT NULL;
+
+ ALTER TABLE `feedclass` 
+	 ADD COLUMN    `group_id` int(11) unsigned NOT NULL DEFAULT 0 COMMENT '集团端id';
+
+
+
+     			   ALTER TABLE feedtemplet
+	  	 ADD COLUMN 		   `cattle` varchar(30) DEFAULT NULL COMMENT '牛群类别',
+    	 ADD COLUMN  `volume` decimal(12,2) NOT NULL DEFAULT 0.00 COMMENT '容积',
+     	 ADD COLUMN  `is_modify` tinyint(1) unsigned NOT NULL DEFAULT 1 COMMENT '是否可修改 0 无效 1 是 2 否',
+     	 ADD COLUMN  `group_data_id` bigint(11) unsigned NOT NULL DEFAULT 0 COMMENT '集团端数据ID',
+     	 ADD COLUMN  `group_version` int(11) unsigned NOT NULL DEFAULT 0 COMMENT '集团端版本号',
+     	 ADD COLUMN  `autozone` int(11) NOT NULL DEFAULT 0,
+     	 ADD COLUMN  `surplus` int(11) DEFAULT NULL COMMENT '剩料配置';
+
+
+
+         			 
+			  ALTER TABLE fpdetail
+	  	 ADD COLUMN 	
+			   `supplement` decimal(38,2) DEFAULT 0.00;
+
+
+
+		   ALTER TABLE ftdetail				 
+	 ADD COLUMN 	 `deviation` int(11) DEFAULT NULL COMMENT '搅拌延时值允许延时偏差',
+ 	 ADD COLUMN 	 `is_modify` tinyint(1) unsigned NOT NULL DEFAULT 1 COMMENT '是否可修改 0 无效 1 是 2 否',
+ 	 ADD COLUMN 	 `is_show` tinyint(1) unsigned NOT NULL DEFAULT 1 COMMENT '是否显示 0 无效 1 显示 2 隐藏',
+ 	 ADD COLUMN 	 `shutdown` tinyint(1) NOT NULL DEFAULT 0 COMMENT '停机时间  秒',
+	 ADD COLUMN 	  `is_surplus` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0 不是剩料';
+
+
+     	   ALTER TABLE ftdry	
+	 	 ADD COLUMN  `excess` tinyint(1) DEFAULT 0 COMMENT '是否剩料';
+
+
+         		  ALTER TABLE tmr	
+		 ADD COLUMN   `lastinorout` int(1) DEFAULT 0,
+ ADD COLUMN  `gps` varchar(50) DEFAULT NULL,
+ADD COLUMN   `volume` decimal(12,2) NOT NULL DEFAULT 0.00 COMMENT '容积',
+ ADD COLUMN  `speed` decimal(12,0) NOT NULL DEFAULT 0 COMMENT '速度',
+ ADD COLUMN  `shutdown` tinyint(1) DEFAULT 0 COMMENT '停机时间  秒',
+ADD COLUMN   `appoint` int(11) DEFAULT NULL COMMENT '撒料车指定搅拌车';
+
+
+     
+     	  ALTER TABLE pasture	
+   ADD COLUMN  `werks` varchar(255) DEFAULT NULL;

conf/app.ini

@@ -41,7 +41,9 @@ UDForwardingSvc = "http://127.0.0.1"
 
 # 对接
 GRFD = 1
-GRFDURL = http://120.48.30.31:88
+#GRFDURL = http://120.48.30.31:88
+GRFDURL = http://172.16.40.20:10001
+
 
 [database]
 Type = mysql
@@ -73,7 +75,7 @@ Host = 192.168.1.93:3326
 #Name = tmrgo
 #Password = kepaiteng!QAZ
 #Host = 222.73.129.15:31306
-Name = tmrwatch5
+Name = tmrwatch23
 TablePrefix =
 
 ShowXormlog = false

http/handle/api/grfdApi.go

@@ -161,16 +161,20 @@ func GetDormBar(pastureid string) error {
 				if err != nil {
 					return err
 				}
+				// break
 				// 下发不修改系数，只修改牛头数
 				_, err = tx.Exec("insert into feedp(id,pastureid,barid,barname,ccount,ratio,ccountratio) "+
-					" values(?,?,(select id from bar where pastureid=? and bname=?),?,(if(?='',0,?)),REPLACE(?,'%',"+
-					"''),REPLACE(?,'%','')*(if(?='',0,?))/100)"+
-					" ON DUPLICATE KEY UPDATE barname=?,ccount=if(?='',0,?),ccountratio=ratio*ccount/100",
+					" values(?,?,(select id from bar where pastureid=? and bname=?),?,(if(concat(?)='',0,?)),REPLACE(?,'%',"+
+					"''),REPLACE(?,'%','')*(if(concat(?)='',0,?))/100)"+
+					" ON DUPLICATE KEY UPDATE barname=?,ccount=if(concat(?)='',0,?),ccountratio=ratio*ccount/100",
 					ids, pastureid, pastureid, penName, penName, cowCount, cowCount, ccountRatio, ccountRatio, cowCount, cowCount, penName,
 					cowCount, cowCount)
 				if err != nil {
 					return err
+					// return err	ors.New(fmt.Sprintf("%s", string(data)))
+
 				}
+				// break
 				if !isexec { //第一次新增栏舍，不去更新feedp
 
 					_, err = tx.Exec(`								UPDATE feedp fp
@@ -554,9 +558,9 @@ func AddOtherDevice() {
 		FROM downloadedplan d 
 		WHERE   (d.mydate=DATE_FORMAT(NOW(),'%Y-%m-%d')OR d.mydate=DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY),'%Y-%m-%d') ) 
 		AND d.isuse=0 
-		AND d.pastureid =(SELECT column_default  FROM information_schema.COLUMNS WHERE table_name = 'recweight' AND table_schema = 'tmrwatch' AND column_name = 'pastureid')
+		AND d.pastureid =(SELECT column_default  FROM information_schema.COLUMNS WHERE table_name = 'recweight' AND table_schema = 'tmrwatch2' AND column_name = 'pastureid')
 		AND (SELECT COUNT(*) FROM downloadplandtl1 d1 WHERE  d.id=d1.PID AND d.pastureid=d1.pastureid  AND  d1.type = 0)>0
-		AND (SELECT COUNT(*) FROM downloadedplan WHERE pastureid = d.pastureid AND  downloadedplan.lpplantype=1 and mydate = d.mydate AND pid = d.pid AND iscompleted = 0) = 0
+		// AND (SELECT COUNT(*) FROM downloadedplan WHERE pastureid = d.pastureid AND  downloadedplan.lpplantype=1 and mydate = d.mydate AND pid = d.pid AND iscompleted = 0) = 0
 		GROUP BY d.pid +UNIX_TIMESTAMP(d.mydate)`).Query().List()
 
 	queryDataList, err2 := tx.SQL(`SELECT  d.pid +UNIX_TIMESTAMP(d.mydate) id,d.projname projName,ROUND(d.lweight,2) lWeight,DATE_FORMAT(d.mydate,'%Y-%m-%d') AS loadDate,d.SORT AS tmrNo,d.Times AS times,ft.backup1 AS ftId,d.templetName  AS ftName,f.backup1 AS fId,
@@ -567,9 +571,10 @@ func AddOtherDevice() {
 		 LEFT JOIN feed f ON de.fid=f.id AND f.pastureid=d.pastureid LEFT JOIN feedtemplet ft ON d.tempid=ft.id AND ft.pastureid=d.pastureid 
 		 LEFT JOIN feedclass fc ON f.fclassid=fc.id AND fc.pastureid=d.pastureid  
 		 WHERE  (d.mydate=DATE_FORMAT(NOW(),'%Y-%m-%d') OR d.mydate=DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY),'%Y-%m-%d') ) AND d.isuse=0  
-		 AND d.pastureid =(SELECT column_default  FROM information_schema.COLUMNS WHERE table_name = 'recweight' AND table_schema = 'tmrwatch' AND column_name = 'pastureid') 
+		 AND d.pastureid =(SELECT column_default  FROM information_schema.COLUMNS WHERE table_name = 'recweight' AND table_schema = 'tmrwatch2' AND column_name = 'pastureid') 
 		 AND (SELECT COUNT(*) FROM downloadplandtl1 d1 WHERE  d.id=d1.PID AND d.pastureid=d1.pastureid  AND  d1.type = 0)>0
-		 AND (SELECT COUNT(*) FROM downloadedplan WHERE pastureid = d.pastureid AND downloadedplan.lpplantype=1 and mydate = d.mydate AND pid = d.pid AND iscompleted = 0) = 0 group by d.pid,de.Fname`).Query().List()
+		//  AND (SELECT COUNT(*) FROM downloadedplan WHERE pastureid = d.pastureid AND downloadedplan.lpplantype=1 and mydate = d.mydate AND pid = d.pid AND iscompleted = 0) = 0
+		  group by d.pid,de.Fname`).Query().List()
 
 	if err1 == nil && err2 == nil {
 		for i := 0; i < len(queryIdList); i++ {
@@ -627,7 +632,7 @@ func AddOtherDevice() {
 				logging.Error("AddOtherDevice err:", err)
 			} else {
 				_, err = tx.Exec(`update downloadedplan set isuse=1 where  pastureid =(SELECT column_default  FROM information_schema.COLUMNS WHERE table_name = 'recweight' 
-							AND table_schema = 'tmrwatch' AND column_name = 'pastureid') and pid  =? and mydate = ? `, queryIdList[i]["did"], queryIdList[i]["mydate"])
+							AND table_schema = 'tmrwatch2' AND column_name = 'pastureid') and pid  =? and mydate = ? `, queryIdList[i]["did"], queryIdList[i]["mydate"])
 				if err != nil {
 					logging.Error("update downloadedplan err:", err)
 				}
@@ -664,7 +669,8 @@ func AddOtherDeviceFeeding() {
  		WHERE  (d.mydate=DATE_FORMAT(NOW(),'%Y-%m-%d')OR d.mydate=DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY),'%Y-%m-%d') )   
  		AND iscompleted=1 AND d.isUse=0
  		AND (SELECT COUNT(*) FROM downloadplandtl2 d2 WHERE  d.id=d2.PID AND d.pastureid=d2.pastureid  AND  d2.type = 0)>0
- 		AND (SELECT COUNT(*) FROM downloadedplan WHERE pastureid = d.pastureid AND mydate = d.mydate AND pid = d.pid AND iscompleted = 0) = 0`).Query().List()
+ 		// AND (SELECT COUNT(*) FROM downloadedplan WHERE pastureid = d.pastureid AND mydate = d.mydate AND pid = d.pid AND iscompleted = 0) = 0
+		`).Query().List()
 
 	queryDataList, err2 := tx.SQL(`		SELECT  d.pid +UNIX_TIMESTAMP(d.mydate) id,d.projname projName,DATE_FORMAT(d.mydate,'%Y-%m-%d') AS dropDate,d.Times AS times,d.SORT AS tmrNo,
 		 bar.bcode AS penId,d2.fname AS penName,fp.CCOUNT AS cowCount, d2.SORT AS sort,d.templetName ftName, ft.backup1 ftId,
@@ -673,7 +679,8 @@ func AddOtherDeviceFeeding() {
 		 LEFT JOIN bar ON  d2.fbarid=bar.id AND bar.pastureid=d2.pastureid LEFT JOIN feedpdate fp ON d2.fbarid=fp.barid AND fp.pastureid=d2.pastureid AND fp.date  = d2.date 
 		 LEFT JOIN feedtemplet ft ON d.tempid=ft.id AND ft.pastureid=d.pastureid 
 		 WHERE  (d.mydate=DATE_FORMAT(NOW(),'%Y-%m-%d')OR d.mydate=DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY),'%Y-%m-%d') )  AND iscompleted=1 AND d.isuse2=0 
-		 AND d.pastureid =(SELECT column_default  FROM information_schema.COLUMNS WHERE table_name = 'recweight' AND table_schema = 'tmrwatch' AND column_name = 'pastureid')`).Query().List()
+		 AND d.pastureid =(SELECT column_default  FROM information_schema.COLUMNS WHERE table_name = 'recweight' AND table_schema = 'tmrwatch2' AND column_name = 'pastureid')
+		 `).Query().List()
 
 	if err1 == nil && err2 == nil {
 
@@ -724,7 +731,7 @@ func AddOtherDeviceFeeding() {
 			} else {
 
 				_, err = tx.Exec(`update downloadedplan set isuse2=1 where  pastureid =(SELECT column_default  FROM information_schema.COLUMNS WHERE table_name = 'recweight' 
-							AND table_schema = 'tmrwatch' AND column_name = 'pastureid') and pid  =? and mydate = ? `, queryIdList[i]["did"], queryIdList[i]["mydate"])
+							AND table_schema = 'tmrwatch2' AND column_name = 'pastureid') and pid  =? and mydate = ? `, queryIdList[i]["did"], queryIdList[i]["mydate"])
 				if err != nil {
 					logging.Error("update downloadedplan err:", err)
 				}

http/handle/api/lpplandtl.go

@@ -382,7 +382,8 @@ func RestoreLpplandtlDay(c *gin.Context) {
 
 		// tx.Table("lpplandtl1").Insert(item)
 		_, err = tx.SQL(`insert into lpplandtl1date(pastureid,lppid,barid,barname,fpdid,fttype,lweight,sort,tmrid,tmrname,ccountradio,background,date)
-		value(?,?,?,?,?,?,?,?,?,?,?,?,?)`, item.Pastureid,
+		value(?,?,?,?,?,?,?,?,?,?,?,?,?) 	  
+		ON DUPLICATE KEY UPDATE lweight = ? `, item.Pastureid,
 			item.Lppid,
 			item.Barid,
 			item.Barname,
@@ -394,7 +395,7 @@ func RestoreLpplandtlDay(c *gin.Context) {
 			item.Tmrname,
 			item.Ccountradio,
 			item.Background,
-			item.Date).Execute()
+			item.Date, item.Lweight).Execute()
 		if err != nil {
 			log.Println("RestoreLpplandtl-error-5", err)
 			tx.Rollback()

http/handle/api/ops.go

@@ -8572,7 +8572,7 @@ func checkPlan(tx *xorm.Session, fasion map[string]interface{}, CommonParamMap m
 	count( 1 ) 
 FROM
 	(
-	SELECT
+		SELECT
 		d.id 
 	FROM
 		downloadedplan d
@@ -8583,11 +8583,12 @@ FROM
 		d.mydate = ?
 		AND d.havebutton = 0 
 		AND lpplantype IN ( 0, 1, 2 ) 
-		AND ( SELECT count( 1 ) FROM downloadplandtl2 dd2 WHERE dd2.pid = d.id ) = 
-		( SELECT count( 1 ) FROM downloadplandtl2 dd2   WHERE dd2.pid = d.pid  and (select count(1) from downloadplandtl2  where pid = dd2.pid  and fname = dd2.fname   ) = 1 )
+		AND ( SELECT count( 1 ) FROM downloadplandtl2 dd2 WHERE dd2.pid = d.id  and  dd2.fname = d2.fname) = 
+		( SELECT count( 1 ) FROM downloadplandtl2 dd2   WHERE dd2.pid = d.id  and (select count(1) from downloadplandtl2  where pid = dd2.pid  and fname = dd2.fname   ) = 1  and dd2.fname = d2.fname )
 	GROUP BY
 	d.id 
 	) d 
+	
 	 `,
 		data["startTime"]).Count()
 	fmt.Println(err)

http/handle/api/scheduled.go

@@ -131,7 +131,7 @@ func CronScheduled(ctx context.Context) {
 	dayCron.Start()
 	// udFeedSync(pastureinfo)
 	// //圣牧自动同步前天有进行中的任务
-	// manualUdData(pastureinfo)
+	manualUdData(pastureinfo)
 	// gm.GmUdSync(pastureinfo.Pastureid, pastureinfo.Werks)
 	// xdmy := cron.New()
 	// err = xdmy.AddFunc("0 30 4 * * *", func() {

module/post_data.go

@@ -54,7 +54,7 @@ func PostDataByName(c *gin.Context, fashion *gofasion.Fasion) (interface{}, erro
 		surplusId := params.Get("surplusId").ValueStr()
 
 		tx.Exec(` delete from ftdetail where ftid  = ?  and is_surplus = 1 `, params.Get("id").ValueStr())
-		if surplus != "日粮" {
+		if surplus != "日粮" && surplus != "" {
 			if surplusId != "0" {
 				dataList, err := tx.Table("ftdetail").Where("ftid = ? ", params.Get("id").ValueStr()).QueryString()
 				if err != nil {