From 846b5c32adf07c710982b78b629fff8a7a5502a1 Mon Sep 17 00:00:00 2001 From: fyf Date: Wed, 18 Oct 2023 14:16:32 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E7=95=8C=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=A4=A7=E5=B0=8F=202.=E8=B0=83=E6=95=B4=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E9=85=8D=E6=96=B9=E6=A0=B9=E6=8D=AE=E5=81=9A=E6=B3=95?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E5=90=8D=E7=A7=B0=203.?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=A1=A5=E6=B0=B4=E5=A2=9E=E5=8A=A0=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=97=B6=E8=87=AA=E5=8A=A8=E5=BB=B6=E8=BF=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bnframework/business/ConfigData.java | 3 + .../business/ExecuteTheRecipe.java | 31 ++++++-- .../bonait/bnframework/business/MainInit.java | 1 + .../common/constant/ConfigName.java | 8 ++ .../bnframework/common/constant/DataBus.java | 2 + .../common/constant/MessageName.java | 2 + .../bonait/bnframework/common/db/QueryDB.java | 17 +++++ .../adapter/newpropertyselect_adapter.java | 3 + .../modules/home/adapter/wl_adapter.java | 11 +++ .../from/fragment/Jcsjgl_wl_fragment.java | 1 + .../from/fragment/JiaoYan_zdbs_fragment.java | 22 ++++++ .../home/fragment/mode/add_pf_control.java | 75 ++++++++++++++++++- .../main/res/layout/activity_goodpeifang.xml | 4 +- .../datatab/layout/fragment_jiaoyan_zdbs.xml | 40 ++++++++++ .../res/layout/datatab/layout/sx_item.xml | 4 +- .../main/res/layout/fragment_jiaoyan_lsjy.xml | 39 +++++----- .../main/res/layout/fragment_jiaoyan_zdqx.xml | 4 +- .../main/res/layout/fragment_make_good.xml | 2 +- .../layout/item/layout/dialog_add_good.xml | 13 ++-- .../item/layout/dialog_add_makegood.xml | 9 ++- .../res/layout/item/layout/dialog_add_pf.xml | 16 ++-- .../layout/item/layout/dialog_add_pf_home.xml | 10 +-- .../main/res/layout/item/layout/item_zsx.xml | 6 +- 23 files changed, 259 insertions(+), 64 deletions(-) diff --git a/app/src/main/java/com/bonait/bnframework/business/ConfigData.java b/app/src/main/java/com/bonait/bnframework/business/ConfigData.java index e7a8e68d..049b32cd 100644 --- a/app/src/main/java/com/bonait/bnframework/business/ConfigData.java +++ b/app/src/main/java/com/bonait/bnframework/business/ConfigData.java @@ -248,6 +248,7 @@ public class ConfigData { ConfigName.getInstance().GT1_AutomaticHeating = ConfigUtil.read(ConfigName.getInstance().dishesCon, "GT1_AutomaticHeating", ConfigName.getInstance().GT1_AutomaticHeating); ConfigName.getInstance().GT2_AutomaticHeating = ConfigUtil.read(ConfigName.getInstance().dishesCon, "GT2_AutomaticHeating", ConfigName.getInstance().GT2_AutomaticHeating); ConfigName.getInstance().AutomaticWaterRefill = ConfigUtil.read(ConfigName.getInstance().dishesCon, "AutomaticWaterRefill", ConfigName.getInstance().AutomaticWaterRefill); + ConfigName.getInstance().AutomaticWaterRefillTime = ConfigUtil.read(ConfigName.getInstance().dishesCon, "AutomaticWaterRefillTime", ConfigName.getInstance().AutomaticWaterRefillTime); } @@ -268,6 +269,8 @@ public class ConfigData { ConfigUtil.write(ConfigName.getInstance().dishesCon,"GT1_AutomaticHeating", ConfigName.getInstance().GT1_AutomaticHeating); ConfigUtil.write(ConfigName.getInstance().dishesCon,"GT2_AutomaticHeating", ConfigName.getInstance().GT2_AutomaticHeating); ConfigUtil.write(ConfigName.getInstance().dishesCon,"AutomaticWaterRefill", ConfigName.getInstance().AutomaticWaterRefill); + ConfigUtil.write(ConfigName.getInstance().dishesCon,"AutomaticWaterRefillTime", ConfigName.getInstance().AutomaticWaterRefillTime); + } diff --git a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java index 4233470a..033bdf1a 100644 --- a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java +++ b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java @@ -20,6 +20,7 @@ import com.bonait.bnframework.common.db.mode.BPA_SILOS; import com.bonait.bnframework.common.db.res.AlertLogEnum; import com.bonait.bnframework.common.db.res.ResGoodsMake; import com.bonait.bnframework.common.db.res.ResGoodsRecipe; +import com.bonait.bnframework.common.db.res.SilosLsjyMode; import com.bonait.bnframework.common.db.res.UserLogEnum; import com.bonait.bnframework.common.helper.ByteHelper; import com.bonait.bnframework.common.helper.DataFormat; @@ -720,14 +721,14 @@ public class ExecuteTheRecipe { } } - if (ConfigName.getInstance().PLC_Address.containsKey("配料次数")) { - BPA_PLCADDRESS plcaddress = ConfigName.getInstance().PLC_Address.get("配料次数"); - if (!plcaddress.address.isEmpty() && ConfigName.getInstance().PlcIsConnect) { - ModbusTcpServer.get().ReadInt(plcaddress.address, 1, (data) -> { - MakeGoodCount=data[0] ; - }); - } - } +// if (ConfigName.getInstance().PLC_Address.containsKey("配料次数")) { +// BPA_PLCADDRESS plcaddress = ConfigName.getInstance().PLC_Address.get("配料次数"); +// if (!plcaddress.address.isEmpty() && ConfigName.getInstance().PlcIsConnect) { +// ModbusTcpServer.get().ReadInt(plcaddress.address, 1, (data) -> { +// MakeGoodCount=data[0] ; +// }); +// } +// } } catch (Exception ex) { ToastUtils.error("异常信息:" + ex.getMessage()); } finally { @@ -813,6 +814,20 @@ public class ExecuteTheRecipe { { WritePLC("水池进水阀",true,null); } + + if(yw!=null) + { + Object jsf= ReadPLC("水池进水阀"); + if(jsf!=null && (boolean)jsf) + { + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + WritePLC("水池进水阀",false,null); + } + }, (int)Math.round((Double.parseDouble(ConfigName.getInstance().AutomaticWaterRefillTime) * 1000))); + } + } } } } catch (Exception ex) { diff --git a/app/src/main/java/com/bonait/bnframework/business/MainInit.java b/app/src/main/java/com/bonait/bnframework/business/MainInit.java index e5a79392..9cb4d649 100644 --- a/app/src/main/java/com/bonait/bnframework/business/MainInit.java +++ b/app/src/main/java/com/bonait/bnframework/business/MainInit.java @@ -102,6 +102,7 @@ public class MainInit { //ConfigData.getInstance().LoadingCloud();//加载云端数据 DataBus.getInstance().GetTodayNoMake(); + //设置连接到有线网络 // NetworkUtils.connetEnternet(app); diff --git a/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java b/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java index f3c043f5..7c25ca38 100644 --- a/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java +++ b/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java @@ -412,6 +412,7 @@ public class ConfigName { add(new Res_PLCADDRESS("排水阀排水时间", "VW244", 1, 1)); add(new Res_PLCADDRESS("循环清洗时间", "VW246", 1, 1)); add(new Res_PLCADDRESS("加热时间", "VW248", 1, 1)); + add(new Res_PLCADDRESS("自动补水延迟时间", "VW250", 1, 1)); add(new Res_PLCADDRESS("清洗模式", "M0.4", 1, 1)); @@ -723,6 +724,8 @@ public class ConfigName { add(new Res_PLCADDRESS("排水阀排水时间", "VW244", 1, 1)); add(new Res_PLCADDRESS("循环清洗时间", "VW246", 1, 1)); add(new Res_PLCADDRESS("加热时间", "VW248", 1, 1)); + add(new Res_PLCADDRESS("自动补水延迟时间", "VW250", 1, 1)); + add(new Res_PLCADDRESS("清洗模式", "M0.4", 1, 1)); add(new Res_PLCADDRESS("自动清洗开始", "M0.5", 1, 1)); @@ -1069,5 +1072,10 @@ public class ConfigName { * 是否自动补水(水池) */ public Boolean AutomaticWaterRefill=false; + + /** + * 自动补水延迟时间 + */ + public String AutomaticWaterRefillTime="0.0"; //endregion } diff --git a/app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java b/app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java index 94c1e63d..ba19fc00 100644 --- a/app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java +++ b/app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java @@ -110,6 +110,8 @@ public class DataBus { { AddGoodsMake(item); } + + ExecuteTheRecipe.MakeGoodCount= QueryDB.GetSuOrderTodanCount(); } /** diff --git a/app/src/main/java/com/bonait/bnframework/common/constant/MessageName.java b/app/src/main/java/com/bonait/bnframework/common/constant/MessageName.java index 55f03954..f6c97fa8 100644 --- a/app/src/main/java/com/bonait/bnframework/common/constant/MessageName.java +++ b/app/src/main/java/com/bonait/bnframework/common/constant/MessageName.java @@ -28,4 +28,6 @@ public interface MessageName { String ClickMakeGoodNew="ClickMakeGoodNew";//点击商品 + String ClickProperty="ClickProperty";//点击属性 + } diff --git a/app/src/main/java/com/bonait/bnframework/common/db/QueryDB.java b/app/src/main/java/com/bonait/bnframework/common/db/QueryDB.java index 0ea70294..8afddb57 100644 --- a/app/src/main/java/com/bonait/bnframework/common/db/QueryDB.java +++ b/app/src/main/java/com/bonait/bnframework/common/db/QueryDB.java @@ -1685,6 +1685,23 @@ public class QueryDB { } return data; } + + /** + * 获取今日总订单 + * @return + */ + public static int GetSuOrderTodanCount() { + String orderby = Desc_Time_Up;//先按排序 创建时间倒序 + String where = "isDelete=? and createTime>? and createTime data = new ArrayList<>(); + ArrayList obj = Get(BPA_SUBORDER.class, where, args, orderby); + for (Object k : obj) { + data.add((BPA_SUBORDER) k); + } + return data.size(); + } //endregion //region BPA_ALERTLOG 预警日志表 diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/newpropertyselect_adapter.java b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/newpropertyselect_adapter.java index ce8fad31..9782dfb8 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/newpropertyselect_adapter.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/newpropertyselect_adapter.java @@ -12,8 +12,10 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.bonait.bnframework.R; +import com.bonait.bnframework.common.constant.MessageName; import com.bonait.bnframework.common.db.res.ResGoodProperty; import com.bonait.bnframework.common.db.res.ResMaterilas; +import com.bonait.bnframework.common.message.MessageManager; import java.util.ArrayList; import java.util.List; @@ -61,6 +63,7 @@ public class newpropertyselect_adapter extends RecyclerView.Adapter { //分别获取 image view 和 textview 的实例 TextView name = view.findViewById(R.id.name); Button button = view.findViewById(R.id.button_item); + Button button_update = view.findViewById(R.id.button_update); + // 设置要显示的图片和文字 name.setText(bpa_material.name); name.setOnClickListener(new View.OnClickListener() { @@ -52,12 +54,21 @@ public class wl_adapter extends ArrayAdapter { } }); + button_update.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if(mListener!=null) mListener.clickListener(view,bpa_material); + } + }); + button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { if(mListener!=null) mListener.clickListener(view,bpa_material); } }); + + return view; } } \ No newline at end of file diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/Jcsjgl_wl_fragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/Jcsjgl_wl_fragment.java index 283f8a93..2cc6995e 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/Jcsjgl_wl_fragment.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/Jcsjgl_wl_fragment.java @@ -217,6 +217,7 @@ public class Jcsjgl_wl_fragment extends BaseFragment implements MyClickListener public void clickListener(View v, Object data) { switch (v.getId()) { case R.id.name://修改物料名称按钮 + case R.id.button_update://修改物料名称按钮 final QMUIDialog.EditTextDialogBuilder builder = new QMUIDialog.EditTextDialogBuilder(context); builder.setTitle("物料名称") .setPlaceholder("在此输入物料名称") diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_zdbs_fragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_zdbs_fragment.java index f506f4a9..b3cae95b 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_zdbs_fragment.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_zdbs_fragment.java @@ -8,6 +8,7 @@ import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; +import android.widget.Button; import android.widget.EditText; import com.bonait.bnframework.R; @@ -15,6 +16,7 @@ import com.bonait.bnframework.business.ConfigData; import com.bonait.bnframework.business.ExecuteTheRecipe; import com.bonait.bnframework.common.base.BaseFragment; import com.bonait.bnframework.common.constant.ConfigName; +import com.bonait.bnframework.common.utils.ToastUtils; import com.orhanobut.logger.Logger; import com.suke.widget.SwitchButton; @@ -25,6 +27,10 @@ public class JiaoYan_zdbs_fragment extends BaseFragment { @BindView(R.id.control_switch_zdbs) SwitchButton control_switch_zdbs;//自动补水 + @BindView(R.id.edittext_ycsj) + EditText edittext_ycsj;//自动补水延迟时间 + @BindView(R.id.save_time) + Button save_time;//自动补水延迟时间 private Context context; @Override @@ -54,6 +60,7 @@ public class JiaoYan_zdbs_fragment extends BaseFragment { */ public void Initdata() { control_switch_zdbs.setChecked(ConfigName.getInstance().AutomaticWaterRefill); + edittext_ycsj.setText(ConfigName.getInstance().AutomaticWaterRefillTime); control_switch_zdbs.setOnCheckedChangeListener(new SwitchButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(SwitchButton view, boolean isChecked) { @@ -66,6 +73,21 @@ public class JiaoYan_zdbs_fragment extends BaseFragment { } } }); + + save_time.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if(edittext_ycsj.getText().toString().isEmpty()) + { + ToastUtils.warning("延迟时间不能为空！"); + return; + } + ConfigName.getInstance().AutomaticWaterRefillTime=edittext_ycsj.getText().toString(); + ConfigData.getInstance().SavePZ(); + ToastUtils.info("保存成功！"); + + } + }); } @Override diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java index 7a6a6b36..79807a7c 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java @@ -1,6 +1,8 @@ package com.bonait.bnframework.modules.home.fragment.mode; +import android.app.Activity; import android.content.Context; +import android.content.ContextWrapper; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; @@ -10,12 +12,14 @@ import android.widget.LinearLayout; import android.widget.ListView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.bonait.bnframework.R; import com.bonait.bnframework.common.constant.DataBus; +import com.bonait.bnframework.common.constant.MessageName; import com.bonait.bnframework.common.db.QueryDB; import com.bonait.bnframework.common.db.mode.BPA_GOODPROPERTY; import com.bonait.bnframework.common.db.mode.BPA_GOODS; @@ -26,6 +30,8 @@ import com.bonait.bnframework.common.db.res.ResGoodProperty; import com.bonait.bnframework.common.db.res.ResGoodsRecipe; import com.bonait.bnframework.common.db.res.ResMaterilas; import com.bonait.bnframework.common.helper.I.MyClickListener; +import com.bonait.bnframework.common.message.MessageLooper; +import com.bonait.bnframework.common.message.MessageManager; import com.bonait.bnframework.common.utils.ToastUtils; import com.bonait.bnframework.common.view.MyLayoutManager; import com.bonait.bnframework.modules.home.adapter.loadinggood_adapter; @@ -83,17 +89,18 @@ public class add_pf_control extends LinearLayout implements MyClickListener { */ public MyClickListener mListener=null; private View root; + public Context acontext=null; public add_pf_control(Context context, @Nullable AttributeSet attrs) { super(context, attrs); root= LayoutInflater.from(context).inflate(R.layout.dialog_add_pf, this); ButterKnife.bind(this, root); + acontext=context; Init(); } public void Init() { - //初始化界面控件的事件 initEvent(); } @@ -142,10 +149,15 @@ public class add_pf_control extends LinearLayout implements MyClickListener { if(i==0) { c.isSelect=true; + }else + { + c.isSelect=false; } i++; } } + + edittext.setText(GetSelectName()); }else { for(ResGoodProperty item:bpa_goodproperties) @@ -227,6 +239,15 @@ public class add_pf_control extends LinearLayout implements MyClickListener { } } + private Activity findActivity(@NonNull Context context) { + if (context instanceof Activity) { + return (Activity) context; + } else if (context instanceof ContextWrapper) { + return findActivity(((ContextWrapper) context).getBaseContext()); + } else { + return null; + } + } private void initEvent() { @@ -246,6 +267,27 @@ public class add_pf_control extends LinearLayout implements MyClickListener { } } }); + + Activity activity = findActivity(acontext); + if (activity != null) { + MessageManager.getInstance().registerMessageReceiver(activity, MessageName.ClickProperty, new MessageLooper.OnMessageListener() { + @Override + public void onMessage(Object msg) { + if (msg != null) { + activity.runOnUiThread(new Runnable() { + @Override + public void run() { + try { + edittext.setText(GetSelectName()); + } catch (Exception e) { + + } + } + }); + } + } + }); + } } /** @@ -305,7 +347,25 @@ public class add_pf_control extends LinearLayout implements MyClickListener { } return false; } - + /** + * 获取选中名称 + * @return + */ + public String GetSelectName() + { + String names=Good.name+"_"; + for(ResGoodProperty item:bpa_goodproperties) + { + for(ResGoodProperty k:item.child) + { + if(k.isSelect) + { + names+=k.name+"_"; + } + } + } + return names.substring(0, names.length() - 1); + } String pfname="";//配方名称集合 String ggids="";//规格id集合 @@ -319,7 +379,7 @@ public class add_pf_control extends LinearLayout implements MyClickListener { pfname=edittext.getText().toString(); if(pfname.isEmpty()) { - ToastUtils.info("配方名称不能为空!"); + ToastUtils.warning("配方名称不能为空!"); return isSuceess; } @@ -343,7 +403,14 @@ public class add_pf_control extends LinearLayout implements MyClickListener { //2.必须选择一个规格 if(DataBus.getInstance().Recipe.size()<=0) { - ToastUtils.info("配方数据表格不能为空!"); + ToastUtils.warning("配方数据表格不能为空!"); + return isSuceess; + } + + //判断配方是否有相同规格的了 + BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids,Good.id); + if (goodsrecipename != null) { + ToastUtils.warning("已有改做法配方,不能在新增了!"); return isSuceess; } diff --git a/app/src/main/res/layout/activity_goodpeifang.xml b/app/src/main/res/layout/activity_goodpeifang.xml index 747cc9ac..d2f8e908 100644 --- a/app/src/main/res/layout/activity_goodpeifang.xml +++ b/app/src/main/res/layout/activity_goodpeifang.xml @@ -33,7 +33,7 @@