fyf
/
AndroidSmartClient
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 1 Wiki Activity
Browse Source

业务修改

授权码生成工具
pry 4 months ago
parent
b572c462c3
commit
73630faa0e
4 changed files with 6 additions and 6 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      app/src/main/java/com/bonait/bnframework/business/ExecuteTest.java
  2. +3
    -3
      app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java
  3. +1
    -1
      app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java
  4. +1
    -1
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java

+ 1
- 1
app/src/main/java/com/bonait/bnframework/business/ExecuteTest.java View File

@@ -292,7 +292,7 @@ public class ExecuteTest {
//endregion


if (ConfigName.getInstance().versionSelectionEnum.equals("大炒自动投料版本") || ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
if (ConfigName.getInstance().versionSelectionEnum.equals("大炒自动投料版本")||ConfigName.getInstance().versionSelectionEnum.equals("800炒锅带投料") || ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
String writeValue = "1号位";
for (HashMap.Entry<String, String> entry : data.entrySet()) {
String key = entry.getKey();


+ 3
- 3
app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java View File

@@ -613,7 +613,7 @@ public class ExecuteTheRecipe {


if (ishand) {
if (ConfigName.getInstance().versionSelectionEnum.equals("大炒自动投料版本") || ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
if (ConfigName.getInstance().versionSelectionEnum.equals("大炒自动投料版本")||ConfigName.getInstance().versionSelectionEnum.equals("800炒锅带投料") || ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
ExecuteTheRecipe.BottomClick1("平移-去1号位");
}
String name = "";
@@ -684,7 +684,7 @@ public class ExecuteTheRecipe {
ExecuteTheRecipe.showlog("手动已确认投入主料:" + name + "-继续流程");
} else {
//自动投料
if (ConfigName.getInstance().versionSelectionEnum.equals("大炒自动投料版本") || ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
if (ConfigName.getInstance().versionSelectionEnum.equals("大炒自动投料版本") ||ConfigName.getInstance().versionSelectionEnum.equals("800炒锅带投料")|| ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
String writeValue = "1号位";
for (HashMap.Entry<String, String> entry : data.entrySet()) {
String key = entry.getKey();
@@ -712,7 +712,7 @@ public class ExecuteTheRecipe {
}

if (IsMoveYiHaoWei()) {
if (ConfigName.getInstance().versionSelectionEnum.equals("大炒自动投料版本") || ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
if (ConfigName.getInstance().versionSelectionEnum.equals("大炒自动投料版本")||ConfigName.getInstance().versionSelectionEnum.equals("800炒锅带投料") || ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
ExecuteTheRecipe.BottomClick1("平移-去1号位");
}
}


+ 1
- 1
app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java View File

@@ -493,7 +493,7 @@ public class BottomNavigationNewActivity extends BaseActivity {

if (ExecuteTheRecipe.IsStart && goodsGroup != null && gongxuIndex != 10000 && goodsrecipesL != null && MakeCipe != null) {
try {
if (ConfigName.getInstance().versionSelectionEnum.equals("大炒自动投料版本") || ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
if (ConfigName.getInstance().versionSelectionEnum.equals("大炒自动投料版本")||ConfigName.getInstance().versionSelectionEnum.equals("800炒锅带投料") || ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
//获取工艺
int k = 1;
ArrayList<BPA_GOODS_PROCESS_DETAIL> goodsrecipes = goodsrecipesL;


+ 1
- 1
app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java View File

@@ -683,7 +683,7 @@ public class Home1Fragment extends BaseFragment {

if (ExecuteTheRecipe.MakeStatus && good != null && gongxuIndex != 10000 && goodsrecipesL != null && MakeCipe != null) {
try {
if (ConfigName.getInstance().versionSelectionEnum.equals("大炒自动投料版本") || ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
if (ConfigName.getInstance().versionSelectionEnum.equals("大炒自动投料版本")||ConfigName.getInstance().versionSelectionEnum.equals("800炒锅带投料") || ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
//获取工艺
int k = 1;
ArrayList<BPA_GOODS_PROCESS_DETAIL> goodsrecipes = goodsrecipesL;


Write Preview
Loading…
Cancel
Save