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 9262d926..e6ee6bcb 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 @@ -30,6 +30,7 @@ import com.bonait.bnframework.common.db.mode.BPA_PROCESS; import com.bonait.bnframework.common.db.mode.BPA_PROCESSModel; import com.bonait.bnframework.common.db.mode.BPA_SILOS; import com.bonait.bnframework.common.db.mode.BPA_SILOSANDMATERIAL; +import com.bonait.bnframework.common.db.mode.BPA_SILOS_CALIBRATE; import com.bonait.bnframework.common.db.mode.BPA_SUBORDER; import com.bonait.bnframework.common.db.mode.BPA_SUGAR; import com.bonait.bnframework.common.db.mode.BPA_SYSTEMSET; @@ -3070,6 +3071,100 @@ public class QueryDB { } //endregion + //region 料仓校准表 + /** + * 新增料仓校准 + * add liup 20240418 + * + * @param data + * @return 是否成功 + */ + public static boolean AddSilosCalibrate(BPA_SILOS_CALIBRATE data) { + return Add(BPA_SILOS_CALIBRATE.class, data); + } + + /** + * 查询所有料仓校准 + * add liup 20240418 + * @return + */ + public static ArrayList GetSilosCalibrateAll() { + String orderby = "num";//先按排序 创建时间倒序 + String where = "isDelete=?"; + String[] args = new String[]{"0"}; + ArrayList data = new ArrayList<>(); + ArrayList obj = Get(BPA_SILOS_CALIBRATE.class, where, args, orderby); + for (Object k : obj) { + data.add((BPA_SILOS_CALIBRATE) k); + } +// LogUtils.d(" GetSilosCalibrateLIst 查询所有料仓校准 data="+data.toString()); + return data; + } + + /** + * 根据ID查询料仓校准 + * + * @return + */ + public static BPA_SILOS_CALIBRATE GetSilosCalibrate(String id) { + BPA_SILOS_CALIBRATE data = null; + String orderby = "null";//先按排序 创建时间倒序 + String where = "isDelete=? and id=?"; + String[] args = new String[]{"0", id}; + ArrayList obj = Get(BPA_SILOS_CALIBRATE.class, where, args, orderby); + for (Object k : obj) { + data = (BPA_SILOS_CALIBRATE) k; + } + return data; + } + + /** + * 根据名称序号料仓校准 + * + * @return + */ + public static BPA_SILOS_CALIBRATE GetSilosCalibrateByNum(int num) { + BPA_SILOS_CALIBRATE data = null; + String orderby = "num";//先按排序 创建时间倒序 + String where = "isDelete=? and num=?"; + String[] args = new String[]{"0", num+""}; + ArrayList obj = Get(BPA_SILOS_CALIBRATE.class, where, args, orderby); + for (Object k : obj) { + data = (BPA_SILOS_CALIBRATE) k; + } + return data; + } + + /** + * 修改料仓校准 + * + * @param id + * @param outputMax + * @param outputMin + * @param inputMax + * @param inputMin + */ + public static void UpdateSilosCalibrate(String id, int outputMax,int outputMin,int inputMax,int inputMin) { + BPA_SILOS_CALIBRATE silos = GetSilosCalibrate(id); + if (silos != null) { + if(outputMax>=0){ + silos.outputTimeMax = outputMax; + } + if(outputMin>=0){ + silos.outputTimeMin = outputMin; + } + if(inputMax>=0){ + silos.inputWightMax = inputMax; + } + if(inputMin>=0){ + silos.inputWightMin = inputMin; + } + Update(BPA_SILOS_CALIBRATE.class, silos); +// ModbusHelper.get().Add(QueryDB.GetSilosCalibrateAll()); + } + } + //endregion + //region 私有 /** diff --git a/app/src/main/java/com/bonait/bnframework/common/db/file/DBHelper.java b/app/src/main/java/com/bonait/bnframework/common/db/file/DBHelper.java index 181ddecd..2e9f5314 100644 --- a/app/src/main/java/com/bonait/bnframework/common/db/file/DBHelper.java +++ b/app/src/main/java/com/bonait/bnframework/common/db/file/DBHelper.java @@ -27,6 +27,7 @@ import com.bonait.bnframework.common.db.mode.BPA_PROCESS; import com.bonait.bnframework.common.db.mode.BPA_PROCESSModel; import com.bonait.bnframework.common.db.mode.BPA_SILOS; import com.bonait.bnframework.common.db.mode.BPA_SILOSANDMATERIAL; +import com.bonait.bnframework.common.db.mode.BPA_SILOS_CALIBRATE; import com.bonait.bnframework.common.db.mode.BPA_SUBORDER; import com.bonait.bnframework.common.db.mode.BPA_SUGAR; import com.bonait.bnframework.common.db.mode.BPA_SYSTEMSET; @@ -131,6 +132,8 @@ public class DBHelper extends SQLiteOpenHelper { CreateTablesAll(BPA_CLOUDDATA.class,null);//云端表 CreateTablesAll(BPA_PLCADDRESS.class,null);//PLC地址模型表 + CreateTablesAll(BPA_SILOS_CALIBRATE.class,null);//料仓校准表 + ForeignKeys(); } /** diff --git a/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_SILOS_CALIBRATE.java b/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_SILOS_CALIBRATE.java new file mode 100644 index 00000000..8f86f4fb --- /dev/null +++ b/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_SILOS_CALIBRATE.java @@ -0,0 +1,41 @@ +package com.bonait.bnframework.common.db.mode; + +/** + * BPA_SILOS[料仓管理表] + * 创建人：fengyoufu add 20230412 + */ +public class BPA_SILOS_CALIBRATE extends ModeBase { + //料仓名称 + public String name; + //料仓编号 + public int num; + //输出时间最大值：s + public int outputTimeMax; + //输出时间最小值：s + public int outputTimeMin; + //输入重量最大值: g + public int inputWightMax; + //输入重量最小值: g + public int inputWightMin; + + + @Override + public String toString() { + return "BPA_SILOS_CALIBRATE{" + + "name='" + name + '\'' + + "num='" + num + '\'' + + ", outputTimeMax=" + outputTimeMax + + ", outputTimeMin=" + outputTimeMin + + ", inputWightMax=" + inputWightMax + + ", inputWightMin=" + inputWightMin + + ", id='" + id + '\'' + + ", createTime='" + createTime + '\'' + + ", updateTime='" + updateTime + '\'' + + ", deleteTime='" + deleteTime + '\'' + + ", deviceID='" + deviceID + '\'' + + ", userID='" + userID + '\'' + + ", isDelete=" + isDelete + + ", exp='" + exp + '\'' + + '}'; + } +} diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_silos_ck_edit.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_silos_ck_edit.java new file mode 100644 index 00000000..53334474 --- /dev/null +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_silos_ck_edit.java @@ -0,0 +1,445 @@ +package com.bonait.bnframework.modules.home.fragment.mode; + +import android.content.Context; +import android.content.DialogInterface; +import android.os.Handler; +import android.os.SystemClock; +import android.util.AttributeSet; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.MotionEvent; +import android.view.View; +import android.widget.ArrayAdapter; +import android.widget.Button; +import android.widget.Chronometer; +import android.widget.EditText; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.RelativeLayout; +import android.widget.Spinner; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.bonait.bnframework.R; +import com.bonait.bnframework.business.ExecuteTheRecipe; +import com.bonait.bnframework.common.db.QueryDB; +import com.bonait.bnframework.common.db.mode.BPA_MATERIAL; +import com.bonait.bnframework.common.db.mode.BPA_SILOSANDMATERIAL; +import com.bonait.bnframework.common.db.res.lcMode; +import com.bonait.bnframework.common.helper.I.IWriteCallBack; +import com.bonait.bnframework.common.helper.I.MyClickListener; +import com.bonait.bnframework.common.utils.ToastUtils; +import com.qmuiteam.qmui.widget.dialog.QMUIDialog; +import com.suke.widget.SwitchButton; + +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.ButterKnife; + +public class add_silos_ck_edit extends LinearLayout { + + @BindView(R.id.title) + TextView title; + + @BindView(R.id.close_from) + Button close_from; + + @BindView(R.id.buchongyuanliao) + Button buchongyuanliao; + + @BindView(R.id.manguan) + Button manguan; + + @BindView(R.id.shezhi) + Button shezhi; + + @BindView(R.id.jiaozhun) + Button jiaozhun;//校准 + + @BindView(R.id.queren) + Button queren;//校准 + + + @BindView(R.id.xuhao) + TextView xuhao; + @BindView(R.id.wuliaoname) + TextView name; + @BindView(R.id.wuliaoimage) + ImageView wuliaoimage; + @BindView(R.id.baifenbi) + TextView baifenbi; + + @BindView(R.id.control_switch_shoudong) + Button control_switch_shoudong; + + @BindView(R.id.control_huishou) + Button control_huishou; + + @BindView(R.id.liaochang_sz) + RelativeLayout liaochang_sz; + + @BindView(R.id.editsp_wl) + Spinner editsp_wl; + + @BindView(R.id.edittext1) + EditText edittext1; + + @BindView(R.id.edittext2) + EditText edittext2; + + @BindView(R.id.control_switch) + SwitchButton control_switch;//料仓开关 + + @BindView(R.id.runtime) + Chronometer runtime;// + + @BindView(R.id.jishiqi) + RelativeLayout jishiqi;// + + ArrayList materials = new ArrayList<>(); + + List names = new ArrayList<>(); + + + /** + * 点击事件 + */ + public MyClickListener mListener = null; + private View root; + + public add_silos_ck_edit(Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + root = LayoutInflater.from(context).inflate(R.layout.dialog_add_silos_ck, this); + ButterKnife.bind(this, root); + Init(); + } + + + public void Init() { + //初始化界面数据 + initData(); + //初始化界面控件的事件 + initEvent(); + } + + + private void initData() { + materials.clear(); + List bpa_materials = QueryDB.GetMaterialALL(); + for (BPA_MATERIAL item : bpa_materials) { + materials.add(item); + } + BPA_MATERIAL wsz = new BPA_MATERIAL(); + wsz.name = "未设置"; + wsz.id = ""; + materials.add(wsz); + + names.clear(); + for (BPA_MATERIAL item : materials) { + names.add(item.name); + } + SetAdapter(editsp_wl, names); + } + + public void SetAdapter(Spinner spinner, List map) { + ArrayAdapter adapter = new ArrayAdapter<>(getContext(), R.layout.spinner_text_item, map); + adapter.setDropDownViewResource(R.layout.spinner_dropdown_item); + spinner.setAdapter(adapter); + } + + boolean ismanguan = false; + + private void initEvent() { + buchongyuanliao.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View view) { + QueryDB.UpdateYL(lcMode.id, lcMode.siloszl); + lcMode.silosmargin = lcMode.siloszl; + SetData(lcMode); + //补充原料 + if (mListener != null) { + mListener.clickListenerNew(view, 1, lcMode); + } + } + }); + name.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View view) { + int index = 0; + int count = 0; + for (BPA_MATERIAL item : materials) { + if (item.name.equals(lcMode.materialName)) { + index = count; + } + count++; + } + String[] items = names.toArray(new String[names.size()]); + final int checkIndex = index; + new QMUIDialog.CheckableDialogBuilder(root.getContext()) + .addItems(items, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + BPA_SILOSANDMATERIAL item = new BPA_SILOSANDMATERIAL(); + BPA_MATERIAL material = materials.get(which); + item.silosID = lcMode.id; + item.materialID = material.id; + //更新 + if (QueryDB.UpdateSilosAndMaterial(item)) { + lcMode.materialId = material.id; + lcMode.materialName = material.name; + if (mListener != null) { + mListener.clickListenerNew(view, 5, lcMode); + name.setText(material.name); + } + SetData(lcMode); + dialog.dismiss(); + } + } + }) + .setCheckedIndex(checkIndex) + .show(); + } + }); + manguan.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View view) { + if (ismanguan == false) { + ismanguan = true; + StartTime(); + ExecuteTheRecipe.WritePLC("手自切换", false, null); + int time = lcMode.bValue <= 0 ? 10 : lcMode.bValue;//默认10秒 + ExecuteTheRecipe.WritePLC("手动控制" + lcMode.num, true, null); + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + ExecuteTheRecipe.WritePLC("手动控制" + lcMode.num, false, null); + ToastUtils.info("满管成功!!!"); + ismanguan = false; + StopTime(); + } + }, time * 1000); + //满管 + if (mListener != null) { + mListener.clickListenerNew(view, 2, lcMode); + } + } else { + ToastUtils.warning("满管中,请稍后!!!"); + } + } + }); + shezhi.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View view) { + liaochang_sz.setVisibility(View.VISIBLE); + int index = 0; + int count = 0; + for (BPA_MATERIAL item : materials) { + if (item.name.equals(lcMode.materialName)) { + index = count; + } + count++; + } + final int checkIndex = index; + editsp_wl.setSelection(checkIndex); + + edittext1.setText(lcMode.siloszl + ""); + edittext2.setText(lcMode.warningValue + ""); + //设置 + if (mListener != null) { + mListener.clickListenerNew(view, 3, lcMode); + } + + } + }); + + queren.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View view) { + + String type = editsp_wl.getSelectedItem().toString(); + String zl = edittext1.getText().toString(); + if (zl == null || zl.isEmpty()) { + ToastUtils.warning("料仓容量不能为空!"); + return; + } + String bjz = edittext2.getText().toString(); + if (bjz == null || bjz.isEmpty()) { + ToastUtils.warning("报警值不能为空!"); + return; + } + + int zl_int = 0; + int bj_int = 0; + + try { + zl_int = Integer.parseInt(zl); + bj_int = Integer.parseInt(bjz); + } catch (Exception ex) { + + } + + if (bj_int > zl_int) { + ToastUtils.warning("报警值不能大于料仓容量!"); + return; + } + + QueryDB.UpdateSilosZL(lcMode.id, zl_int); + QueryDB.UpdateSilosBJZ(lcMode.id, bj_int); + lcMode.siloszl = zl_int; + lcMode.warningValue = bj_int; + + BPA_SILOSANDMATERIAL item = new BPA_SILOSANDMATERIAL(); + BPA_MATERIAL material = materials.get(editsp_wl.getSelectedItemPosition()); + item.silosID = lcMode.id; + item.materialID = material.id; + //更新 + if (QueryDB.UpdateSilosAndMaterial(item)) { + lcMode.materialId = material.id; + lcMode.materialName = material.name; + } + SetData(lcMode); + liaochang_sz.setVisibility(View.GONE); + + if (mListener != null) { + mListener.clickListenerNew(view, 6, lcMode); + } + } + }); + jiaozhun.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View view) { + //校准 + if (mListener != null) { + mListener.clickListenerNew(view, 4, lcMode); + } + } + }); + close_from.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + liaochang_sz.setVisibility(View.GONE); + if (mListener != null) { + mListener.clickListenerNew(v, 0, null); + } + } + }); + control_switch_shoudong.setOnTouchListener(new OnTouchListener() { + @Override + public boolean onTouch(View view, MotionEvent motionEvent) { + if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) { + Log.e("鼠标", "按下: "); + ExecuteTheRecipe.WritePLC("手自切换", false, new IWriteCallBack() { + @Override + public void onSuccess() { + ExecuteTheRecipe.WritePLC("手动控制" + lcMode.num, true, null); + } + + @Override + public void onFailure(String ErrorMsg) { + } + }); + } else if (motionEvent.getAction() == MotionEvent.ACTION_UP) { + Log.e("鼠标", "松开: "); + ExecuteTheRecipe.WritePLC("手动控制" + lcMode.num, false, null); + } + return false; + } + }); + + control_huishou.setOnTouchListener(new OnTouchListener() { + @Override + public boolean onTouch(View view, MotionEvent motionEvent) { + if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) { + Log.e("鼠标", "按下: "); + ExecuteTheRecipe.WritePLC("手自切换", false, new IWriteCallBack() { + @Override + public void onSuccess() { + ExecuteTheRecipe.WritePLC("M_外置仓" + lcMode.num + "反转", true, null); + } + @Override + public void onFailure(String ErrorMsg) { + } + }); + } else if (motionEvent.getAction() == MotionEvent.ACTION_UP) { + Log.e("鼠标", "松开: "); + ExecuteTheRecipe.WritePLC("M_外置仓" + lcMode.num + "反转", false, null); + } + return false; + } + }); + + control_switch.setOnCheckedChangeListener(new SwitchButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(SwitchButton view, boolean isChecked) { + //设置 + lcMode.status = isChecked ? 0 : 1; + QueryDB.UpdateSilosStatus(lcMode.id, isChecked); + } + }); + } + + lcMode lcMode = null; + + public void SetData(lcMode _good) { + lcMode = _good; + control_switch.setChecked(_good.status == 0 ? true : false); + title.setText("查看料仓-(" + lcMode.name + ")"); + xuhao.setText(lcMode.exp + ""); + + if (lcMode.name.equals("外置仓")) { + control_huishou.setVisibility(View.VISIBLE); + } else { + control_huishou.setVisibility(View.GONE); + } + + name.setText(lcMode.materialName.isEmpty() ? "未设置" : (lcMode.materialName + "")); + if (lcMode.materialName.isEmpty() || lcMode.materialName.equals("未设置")) { + wuliaoimage.setImageResource(R.mipmap.newsilos); + baifenbi.setText(""); + } else { + if (lcMode.warningValue >= lcMode.silosmargin || lcMode.siloszl == 0) { + wuliaoimage.setImageResource(R.mipmap.newsilos_yc); + } else { + wuliaoimage.setImageResource(R.mipmap.newsilos); + } + baifenbi.setText(get(lcMode.silosmargin, lcMode.siloszl)); + } + } + + public static String get(int up, int down) { + if (down == 0) { + return "0%"; + } + double value = new BigDecimal((float) up / down).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + return new DecimalFormat("#%").format(value); + } + + + /** + * 启动定时器 + */ + public void StartTime() { + jishiqi.setVisibility(View.VISIBLE); + + runtime.setBase(SystemClock.elapsedRealtime()); + runtime.start(); + } + + /** + * 停止定时器 + */ + public int StopTime() { + jishiqi.setVisibility(View.GONE); + long elapsedMillis = SystemClock.elapsedRealtime() - runtime.getBase(); + runtime.stop(); + + int time = (int) (elapsedMillis / 1000); + return time;//当前点击多少秒 + } +} diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java index 53f60b00..fc93ec3e 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java @@ -89,15 +89,15 @@ public class silos_jiaoyan extends LinearLayout { //endregion //region 称相关 - @BindView(R.id.dianzicheng1) - TextView dianzicheng1; +// @BindView(R.id.dianzicheng1) +// TextView dianzicheng1; @BindView(R.id.dianzicheng2) TextView dianzicheng2; @BindView(R.id.dianzicheng3) TextView dianzicheng3; - @BindView(R.id.chuliaokeshu1) - EditText chuliaokeshu1; +// @BindView(R.id.chuliaokeshu1) +// EditText chuliaokeshu1; @BindView(R.id.chuliaokeshu2) EditText chuliaokeshu2; @BindView(R.id.chuliaokeshu3) @@ -119,17 +119,17 @@ public class silos_jiaoyan extends LinearLayout { //endregion //region 物料校准变量 - @BindView(R.id.wljz1) - EditText wljz1; +// @BindView(R.id.wljz1) +// EditText wljz1; - @BindView(R.id.wljz2) - EditText wljz2; +// @BindView(R.id.wljz2) +// EditText wljz2; - @BindView(R.id.wljz3) - EditText wljz3; +// @BindView(R.id.wljz3) +// EditText wljz3; - @BindView(R.id.text_wljz) - TextView text_wljz2; +// @BindView(R.id.text_wljz) +// TextView text_wljz2; //endregion //region 通道补偿 @@ -148,7 +148,8 @@ public class silos_jiaoyan extends LinearLayout { public silos_jiaoyan(Context context, @Nullable AttributeSet attrs) { super(context, attrs); - root= LayoutInflater.from(context).inflate(R.layout.silos_jiaoyan_item, this); +// root= LayoutInflater.from(context).inflate(R.layout.silos_jiaoyan_item, this); + root= LayoutInflater.from(context).inflate(R.layout.silos_jiaoyan_item_edit, this); ButterKnife.bind(this, root); //初始化界面控件的事件 initEvent(); @@ -184,8 +185,8 @@ public class silos_jiaoyan extends LinearLayout { text_bckz1.setVisibility(View.VISIBLE); - text_wljz2.setVisibility(View.GONE); - wljz2.setVisibility(View.GONE); +// text_wljz2.setVisibility(View.GONE); +// wljz2.setVisibility(View.GONE); }else { text_jlkz.setVisibility(View.GONE); @@ -194,8 +195,8 @@ public class silos_jiaoyan extends LinearLayout { text_bckz1.setVisibility(View.GONE); - text_wljz2.setVisibility(View.GONE); - wljz2.setVisibility(View.GONE); +// text_wljz2.setVisibility(View.GONE); +// wljz2.setVisibility(View.GONE); } } @@ -386,7 +387,7 @@ public class silos_jiaoyan extends LinearLayout { ExecuteTheRecipe.WritePLC("校准值" + kkk, (short) zhongliangxianshi, null); String s = String.valueOf(zhongliangxianshi); String zll = String.format("%.1f", (Double.parseDouble(s) / 10)); - wljz3.setText(zll + ""); +// wljz3.setText(zll + ""); lcMode.jValue = zll; QueryDB.UpdateJYZ(lcMode.id, zll); ToastUtils.warning("通道校准完成！"); @@ -422,9 +423,9 @@ public class silos_jiaoyan extends LinearLayout { String time = lcMode.jTime == null ? "0.0" : lcMode.jTime; String ftime = lcMode.fTime == null ? "0.0" : lcMode.fTime; String jvalue = lcMode.jValue == null ? "0.0" : lcMode.jValue; - wljz1.setText(time); - wljz2.setText(ftime); - wljz3.setText(jvalue); +// wljz1.setText(time); +// wljz2.setText(ftime); +// wljz3.setText(jvalue); String Gxs = lcMode.Gxs == null ? "0.0" : lcMode.Gxs; String Lxs = lcMode.Lxs == null ? "0.0" : lcMode.Lxs; @@ -450,7 +451,7 @@ public class silos_jiaoyan extends LinearLayout { public void handleMessage(Message msg) { switch (msg.what) { case 0: - dianzicheng1.setText(String.valueOf((int) ExecuteTheRecipe.OutletWeigh / 10.0) + " g"); +// dianzicheng1.setText(String.valueOf((int) ExecuteTheRecipe.OutletWeigh / 10.0) + " g"); dianzicheng2.setText(String.valueOf((int) ExecuteTheRecipe.OutletWeigh / 10.0) + " g"); dianzicheng3.setText(String.valueOf((int) ExecuteTheRecipe.OutletWeigh / 10.0) + " g"); break; @@ -470,8 +471,9 @@ public class silos_jiaoyan extends LinearLayout { //region 点击事件 @OnClick({ - R.id.qingling1, R.id.qingling2, R.id.qingling3, - R.id.chuliao1, R.id.chuliao2, R.id.chuliao3, +// R.id.qingling1,R.id.chuliao1, + R.id.qingling2, R.id.qingling3, + R.id.chuliao2, R.id.chuliao3, R.id.click_mgjz, R.id.click_mgjz_save, R.id.click_wljz, R.id.click_wljz_save, R.id.click_bcjz_save, @@ -543,22 +545,22 @@ public class silos_jiaoyan extends LinearLayout { * 模拟出料 */ public void mncl() { - String zltext = chuliaokeshu1.getText().toString(); - if (TypeName.equals("物料校准")) { - zltext = chuliaokeshu1.getText().toString(); - } else if (TypeName.equals("酱料校准")) { - zltext = chuliaokeshu2.getText().toString(); - } else if (TypeName.equals("补偿校准")) { - zltext = chuliaokeshu3.getText().toString(); - } - - if (zltext.equals("")) { - ToastUtils.warning("出料重量不能为空！"); - return; - } +// String zltext = chuliaokeshu1.getText().toString(); +// if (TypeName.equals("物料校准")) { +// zltext = chuliaokeshu1.getText().toString(); +// } else if (TypeName.equals("酱料校准")) { +// zltext = chuliaokeshu2.getText().toString(); +// } else if (TypeName.equals("补偿校准")) { +// zltext = chuliaokeshu3.getText().toString(); +// } + +// if (zltext.equals("")) { +// ToastUtils.warning("出料重量不能为空！"); +// return; +// } double zl = 0; try { - zl = Double.parseDouble(zltext); +// zl = Double.parseDouble(zltext); } catch (Exception e) { ToastUtils.warning("出料重量获取异常！" + e.getMessage()); return; @@ -608,14 +610,14 @@ public class silos_jiaoyan extends LinearLayout { //region 保存物料校准参数 public void SaveWLJZ() { - String stime = wljz1.getText().toString(); - String ftime = wljz2.getText().toString(); - String zl = wljz3.getText().toString(); +// String stime = wljz1.getText().toString(); +// String ftime = wljz2.getText().toString(); +// String zl = wljz3.getText().toString(); - if (stime.equals("")) { - ToastUtils.warning("校准基准时间不能为空！"); - return; - } +// if (stime.equals("")) { +// ToastUtils.warning("校准基准时间不能为空！"); +// return; +// } if (zl.equals("")) { ToastUtils.warning("校准重量不能为空！"); @@ -626,7 +628,7 @@ public class silos_jiaoyan extends LinearLayout { int ftime_1 = 0; try { - stime_1 = (int) Math.round((Double.parseDouble(stime) * 10)); +// stime_1 = (int) Math.round((Double.parseDouble(stime) * 10)); } catch (Exception e) { ToastUtils.error("时间异常！" + e.getMessage()); return; @@ -634,7 +636,7 @@ public class silos_jiaoyan extends LinearLayout { double zhongl= 0; try { - zhongl=Double.parseDouble(zl); +// zhongl=Double.parseDouble(zl); } catch (Exception e) { ToastUtils.error("校准重量获取异常！" + e.getMessage()); return; @@ -646,12 +648,12 @@ public class silos_jiaoyan extends LinearLayout { if (!ConfigName.getInstance().versionSelectionEnum.equals("奶茶机")) { - if (ftime.equals("")) { - ToastUtils.warning("反转基准时间不能为空！"); - return; - } +// if (ftime.equals("")) { +// ToastUtils.warning("反转基准时间不能为空！"); +// return; +// } try { - ftime_1 = (int) Math.round((Double.parseDouble(ftime) * 10)); +// ftime_1 = (int) Math.round((Double.parseDouble(ftime) * 10)); } catch (Exception e) { ToastUtils.error("时间异常！" + e.getMessage()); return; @@ -668,16 +670,16 @@ public class silos_jiaoyan extends LinearLayout { } }); } - lcMode.fTime=ftime; - lcMode.jTime=stime; - lcMode.jValue=zl; +// lcMode.fTime=ftime; +// lcMode.jTime=stime; +// lcMode.jValue=zl; ArrayList Ss=QueryDB.GetSilosALL(); for (BPA_SILOS item:Ss) { - QueryDB.UpdateSilosJZTime(item.id, stime, ftime); +// QueryDB.UpdateSilosJZTime(item.id, stime, ftime); } - QueryDB.UpdateJYZ(lcMode.id, zl); +// QueryDB.UpdateJYZ(lcMode.id, zl); ExecuteTheRecipe.WritePLC("基准时间", (short) stime_1, new IWriteCallBack() { @Override public void onSuccess() { diff --git a/app/src/main/res/drawable/edit_bord.xml b/app/src/main/res/drawable/edit_bord.xml new file mode 100644 index 00000000..0b949e15 --- /dev/null +++ b/app/src/main/res/drawable/edit_bord.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml b/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml new file mode 100644 index 00000000..3cf0a15e --- /dev/null +++ b/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml @@ -0,0 +1,844 @@ + + + + + + + + + + + + + + + + + + + + + + +