Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yxj

2022-10-09 c23b8434054d5de5ef8575e25c4441ede6c6ac2d

 APSM/×°ÅäÖÇÄÜÅųÌ/Sc_ICMOAutoSortBill.cs

@@ -692,7 +692,7 @@
                        //判断资源剩余工时，是否大于 ç”Ÿäº§å‘¨æœŸ
                        if (DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[j]["剩余工时"]) > sLeftProdTimes)
                        {
                            if (iLeftQty > 0)
                            if (iLeftQty > 0) // ç”Ÿäº§è®¢å•å‰©ä½™æ•°é‡
                            {
                                //在本资源上生产
                                //获取该生产资源的剩余工时进行排程。
@@ -705,7 +705,7 @@
                                dsSub = Sc_ICMOSortBillFun.GetWorkSourceTimeBySource(oCn, lSourceID);
                                if (dsSub == null || dsSub.Tables[0].Rows.Count == 0)
                                {
                                    continue;
                                    continue;//如果没有剩余则 æ‰§è¡Œä¸‹ä¸€ä¸ªç”Ÿäº§è®¢å•
                                }
                                if (dsSub != null  )//不加班排程
                                {