剩料

conf/app.ini

@@ -75,7 +75,7 @@ Host = 192.168.1.93:3326
 #Name = tmrgo
 #Password = kepaiteng!QAZ
 #Host = 222.73.129.15:31306
-Name = tmrwatch23
+Name = grfd
 TablePrefix =
 
 ShowXormlog = false

http/handle/api/grfdApi.go

@@ -560,7 +560,7 @@ func AddOtherDevice() {
 		AND d.isuse=0 
 		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,
@@ -573,7 +573,7 @@ func AddOtherDevice() {
 		 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 = '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,de.Fname`).Query().List()
 
 	if err1 == nil && err2 == nil {
@@ -667,9 +667,9 @@ func AddOtherDeviceFeeding() {
 	queryIdList, err1 := tx.SQL(`SELECT d.pid +UNIX_TIMESTAMP(d.mydate) id,d.pid did,d.projname projName,DATE_FORMAT(d.mydate,'%Y-%m-%d') mydate 
 		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 iscompleted=1 AND d.isUse=0
+ 		AND iscompleted=1 AND d.isuse2=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
+ 		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,

http/handle/api/scheduled.go

@@ -131,15 +131,15 @@ 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() {
-	// 	// 	//现代牧业sap同步
+	// 	// 	// 	//现代牧业sap同步
 	// 	sap.SyncMaterialOutbound()
-	// 	// 	// 光明ud同步
-	// 	// 	fmt.Println(time.Now())
-	// 	// gm.GmUdSync(pastureinfo.Pastureid, pastureinfo.Werks)
+	// 	// 	// 	// 光明ud同步
+	// 	// 	// 	fmt.Println(time.Now())
+	// 	// 	// gm.GmUdSync(pastureinfo.Pastureid, pastureinfo.Werks)
 	// })
 	// xdmy.Start()
 	// InitMqttClient()

http/handle/sap/sap.go

@@ -124,12 +124,12 @@ func materialOutbound(pastureId, date string) error {
 		return err
 	}
 
-	dataList, err := tx.SQL(`		SELECT 
+	dataList, err := tx.SQL(`			SELECT 
 	tem.sort ZEILE,
 	tem.feedname MAKTX,
 	ifnull(ROUND(if(tem.lweight<0,0,tem.lweight),(select  inforvalue from sysopt  where inforname="decimalPlaces" and pastureid =? )),0)lweight,
 	ifnull(ROUND(tem.actualweightminus,(select  inforvalue from sysopt  where inforname="decimalPlaces" and pastureid = ?)),0) MENGE
-	,tem.bname CHSTX,tem.sapcode CHSNO,tem.cattle FCWTS,tem.MATNR,tem.sapGoods LGORT
+	,tem.bname CHSTX,if( LOCATE("_剩料","日粮_剩料") = 0 , tem.sapcode,(select  inforvalue from sysopt  where inforname="excess" and pastureid =? ) ) CHSNO,tem.cattle FCWTS,tem.MATNR,tem.sapGoods LGORT
 
 	 FROM (
 	(SELECT 
@@ -207,7 +207,7 @@ left join feed f on f.id = ftd.fid
 	
 	) tem
 	
-	ORDER BY tem.d2sort,tem.feedname  `, pastureId, pastureId, pastureId, date, pastureId, date).Query().List()
+	ORDER BY tem.d2sort,tem.feedname   `, pastureId, pastureId, pastureId, pastureId, date, pastureId, date).Query().List()
 	if err != nil {
 		logs.Error(err)
 		return err

update.sql

@@ -345,11 +345,10 @@ 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 DEFAULT CHARSET=utf8mb3;
-
-
+) ENGINE=InnoDB AUTO_INCREMENT=180 DEFAULT CHARSET=utf8mb3;
 
 
 ALTER TABLE `feedtemplet` 
@@ -360,4 +359,7 @@ ADD COLUMN `is_surplus` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0 不是剩料' A
 
 
 ALTER TABLE `downloadplandtl1_exec` 
-ADD COLUMN `surplus` decimal(10, 2) NULL COMMENT '剩料重量' AFTER `xxwFeedCode`;
+ADD COLUMN `surplus` decimal(10, 2) NULL COMMENT '剩料重量' AFTER `xxwFeedCode`;
+
+
+INSERT INTO `dictlist` ( `pid`, `pastureId`, `label`, `value`, `orderby`, `enable`) VALUES ( 19, NULL, '剩料', '5', NULL, 1);