@@ -1411,7 +1411,7 @@ public class ExecuteTheRecipe { | |||||
RecordManager.getInstance().addLogRecord("订单处理日志",deviceNum+"号炒锅-ThreadDelay-"+"延迟等待"+delay+"秒"); | RecordManager.getInstance().addLogRecord("订单处理日志",deviceNum+"号炒锅-ThreadDelay-"+"延迟等待"+delay+"秒"); | ||||
int AtPresentTime = delay; | int AtPresentTime = delay; | ||||
long startTime = System.currentTimeMillis(); | long startTime = System.currentTimeMillis(); | ||||
while ((System.currentTimeMillis() - startTime) <= (delay * 1000) && !ConfigName.IsForcedEnd[deviceNum-1] &&!ConfigName.IsPause[deviceNum-1]&&!ConfigName.TEST) { | |||||
while ((System.currentTimeMillis() - startTime) <= (delay * 1000) && !ConfigName.IsForcedEnd[deviceNum-1] &&!ConfigName.IsPause[deviceNum-1]) { | |||||
try { | try { | ||||
Thread.sleep(100); | Thread.sleep(100); | ||||
int mmmm = delay - (int) ((System.currentTimeMillis() - startTime) / 1000); | int mmmm = delay - (int) ((System.currentTimeMillis() - startTime) / 1000); | ||||
@@ -33,7 +33,7 @@ import java.util.concurrent.ConcurrentHashMap; | |||||
*/ | */ | ||||
public class ConfigName { | public class ConfigName { | ||||
//是否是测试模式 | //是否是测试模式 | ||||
public final static boolean TEST = true; | |||||
public final static boolean TEST = false; | |||||
//崩溃重启 | //崩溃重启 | ||||
public final static boolean ERROR_ROOT = false; | public final static boolean ERROR_ROOT = false; | ||||
//日志打印 | //日志打印 | ||||
@@ -296,6 +296,19 @@ public class HomeOrderFragment extends BaseFragment { | |||||
//刷新右侧配料信息 | //刷新右侧配料信息 | ||||
foodInfoList.clear(); | foodInfoList.clear(); | ||||
List<BPA_GOODS_PROCESS_DETAIL> details = GoodsProcessDetailDBUtil.getByGroupId(orderDetail.groupId); | List<BPA_GOODS_PROCESS_DETAIL> details = GoodsProcessDetailDBUtil.getByGroupId(orderDetail.groupId); | ||||
if(orderDetail.status!=0){ | |||||
if(orderDetail.type == 1){ | |||||
if(!ConfigName.goodsProcess1.isEmpty()){ | |||||
details.clear(); | |||||
details.addAll(ConfigName.goodsProcess1); | |||||
} | |||||
}else if(orderDetail.type==2){ | |||||
if(!ConfigName.goodsProcess2.isEmpty()){ | |||||
details.clear(); | |||||
details.addAll(ConfigName.goodsProcess2); | |||||
} | |||||
} | |||||
} | |||||
for(BPA_GOODS_PROCESS_DETAIL detail:details){ | for(BPA_GOODS_PROCESS_DETAIL detail:details){ | ||||
foodInfoList.add(detail.processname+":"+ ProcessValueUtil.getProcessSms(detail.processvalue)); | foodInfoList.add(detail.processname+":"+ ProcessValueUtil.getProcessSms(detail.processvalue)); | ||||
} | } | ||||
@@ -40,7 +40,7 @@ | |||||
android:layout_width="800dp" | android:layout_width="800dp" | ||||
android:layout_marginTop="60dp" | android:layout_marginTop="60dp" | ||||
android:background="@color/main_color1" | android:background="@color/main_color1" | ||||
android:layout_height="440dp"/> | |||||
android:layout_height="410dp"/> | |||||
<TextView | <TextView | ||||
android:layout_width="800dp" | android:layout_width="800dp" | ||||
android:layout_height="50dp" | android:layout_height="50dp" | ||||
@@ -48,7 +48,7 @@ | |||||
android:text="2号炒锅" | android:text="2号炒锅" | ||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:layout_gravity="bottom|end" | android:layout_gravity="bottom|end" | ||||
android:layout_marginBottom="440dp" | |||||
android:layout_marginBottom="410dp" | |||||
android:gravity="center" | android:gravity="center" | ||||
android:layout_marginTop="770dp" | android:layout_marginTop="770dp" | ||||
android:background="@color/main_title_color1" | android:background="@color/main_title_color1" | ||||
@@ -59,7 +59,7 @@ | |||||
android:layout_gravity="bottom|end" | android:layout_gravity="bottom|end" | ||||
android:layout_width="800dp" | android:layout_width="800dp" | ||||
android:background="@color/main_color1" | android:background="@color/main_color1" | ||||
android:layout_height="440dp"/> | |||||
android:layout_height="410dp"/> | |||||
</FrameLayout> | </FrameLayout> | ||||
<com.qmuiteam.qmui.widget.QMUITopBarLayout | <com.qmuiteam.qmui.widget.QMUITopBarLayout | ||||