更新PLC地址位置9

app/src/main/java/com/example/bpa/MainActivity.java

@@ -530,15 +530,15 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
             ResGoodsMake statusMode = DataBus.getInstance().GoodsSMMake.get(0);
 
 
-//            if (!DataBus.getInstance().PlcIsConnect) {
-//                T.show(this, "PLC未连接,不允许制作！");
-//                return;
-//            }
-//
-//            if (BusinessServer.Get().Commoditys.size() > 0) {
-//                T.show(this, "请等待前一饮品制作完成！");
-//                return;
-//            }
+            if (!DataBus.getInstance().PlcIsConnect) {
+                T.show(this, "PLC未连接,不允许制作！");
+                return;
+            }
+
+            if (BusinessServer.Get().Commoditys.size() > 0) {
+                T.show(this, "请等待前一饮品制作完成！");
+                return;
+            }
 
             // 1.创建弹框对象,显示在当前页面
             AlertDialog.Builder ab = new AlertDialog.Builder(this);

app/src/main/java/com/example/bpa/service/OrderServer.java

@@ -379,7 +379,7 @@ public class OrderServer {
                                 {
                                     da.id=java.util.UUID.randomUUID().toString();
                                     da.materialID = a.BatchingId;
-                                    da.value =String.format ("%.1f", a.ActionValue); 
+                                    da.value =String.format ("%.1f", Double.parseDouble(a.ActionValue));
                                     da.sort =Integer.parseInt(actions.Sort);
                                     QueryDB.AddGoodsSrecipe(da);
                                 }

app/src/main/java/com/example/bpa/view/adapter/maingoods_adapter.java

@@ -129,16 +129,16 @@ public class maingoods_adapter extends RecyclerView.Adapter<RecyclerView.ViewHol
          */
         public void Make(View view)
         {
-//            if(!DataBus.getInstance().PlcIsConnect)
-//            {
-//              T.show(view.getContext(),"PLC未连接,不允许下单！");
-//              return;
-//            }
-//
-//            if (BusinessServer.Get().Commoditys.size() > 0) {
-//                T.show(view.getContext(), "请等待前一饮品制作完成！");
-//                return;
-//            }
+            if(!DataBus.getInstance().PlcIsConnect)
+            {
+              T.show(view.getContext(),"PLC未连接,不允许下单！");
+              return;
+            }
+
+            if (BusinessServer.Get().Commoditys.size() > 0) {
+                T.show(view.getContext(), "请等待前一饮品制作完成！");
+                return;
+            }
 
             BPA_ORDER order=new BPA_ORDER();
             order.thirdPartyID="手动下单";