gengx

app/src/main/java/com/bonait/bnframework/business/OrderServer.java

@@ -245,7 +245,7 @@ public class OrderServer {
                 goodx.userID = ConfigName.getInstance().user.userID;
                 goodx.foreignKeyRe=item.ForeignKeyRe;
                 goodx.goodtype=item.TypeId;
-                goodx.materialids=item.materialids;
+                goodx.materialids=item.DefaultMate;
                 QueryDB.AddGoods(goodx);
                 k++;
             }

app/src/main/java/com/bonait/bnframework/common/helper/mode/BPA_GoodsInfo.java

@@ -51,5 +51,5 @@ public class BPA_GoodsInfo {
     public String Design;//做法
 
     public String TypeId;//小类id
-    public String materialids;//默认物料集合
+    public String DefaultMate;//默认物料集合
 }

app/src/main/java/com/bonait/bnframework/modules/home/adapter/liaochang_adapter.java

@@ -11,6 +11,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -70,16 +71,16 @@ public class liaochang_adapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
                 if(lcMode.materialName.isEmpty() || lcMode.materialName.equals("未设置"))
                 {
-                    myViewHolder.wuliaoimage.setImageResource(R.mipmap.liaochang_by);
                     myViewHolder.baifenbi.setText("");
+                    myViewHolder.gaojing.setVisibility(View.GONE);
                 }else
                 {
                     if(lcMode.siloszl<=lcMode.silosmargin || lcMode.siloszl==0)
                     {
-                        myViewHolder.wuliaoimage.setImageResource(R.mipmap.liaochang_yc);
+                        myViewHolder.gaojing.setVisibility(View.VISIBLE);
                     }else
                     {
-                        myViewHolder.wuliaoimage.setImageResource(R.mipmap.liaochang_zc);
+                        myViewHolder.gaojing.setVisibility(View.GONE);
                     }
                     myViewHolder.baifenbi.setText(get(lcMode.silosmargin,lcMode.siloszl));
                 }
@@ -189,12 +190,15 @@ public class liaochang_adapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         ImageView wuliaoimage;
 
         TextView baifenbi;
+
+        LinearLayout gaojing;
         public MyLCViewHolder1(View view) {
             super(view);
             xuhao = view.findViewById(R.id.xuhao);//序号
             name = view.findViewById(R.id.wuliaoname);
             wuliaoimage=view.findViewById(R.id.wuliaoimage);
             baifenbi= view.findViewById(R.id.baifenbi);//序号
+            gaojing= view.findViewById(R.id.gaojing);//序号
         }
     }
 }

app/src/main/java/com/bonait/bnframework/modules/home/fragment/SheZhifragment.java

@@ -56,12 +56,12 @@ public class SheZhifragment extends BaseFragment {
         mTopBar.setTitle("订单管理");
     }
 
-    @OnClick({R.id.plckz,R.id.xtcs,R.id.imagegl,R.id.shebeixinxi})
+    @OnClick({R.id.xtcs,R.id.imagegl,R.id.shebeixinxi})
     public void onViewClicked(View view) {
         switch (view.getId()) {
-            case R.id.plckz://
-                skipToActivity(PlcControlActivity.class);
-                break;
+//            case R.id.plckz://
+//                skipToActivity(PlcControlActivity.class);
+//                break;
             case R.id.xtcs://
                 skipToActivity(SystemParameterActivity.class);
                 break;

app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/ImageButtonControl.java

@@ -0,0 +1,74 @@
+package com.bonait.bnframework.modules.home.fragment.mode;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.bonait.bnframework.R;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class ImageButtonControl  extends LinearLayout {
+    @BindView(R.id.caidan_image)
+    ImageView image_u;
+    @BindView(R.id.caidan_text)
+    TextView text_u;
+    @BindView(R.id.rea_main)
+    RelativeLayout rea_main;
+    private View root;
+    private int ks_ys = R.mipmap.silos1;
+    private int showbk=-9999;
+    public ImageButtonControl(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        root= LayoutInflater.from(context).inflate(R.layout.imagebuttomcontrol, this);
+        ButterKnife.bind(this, root);
+        initParams(root.getContext(), attrs);
+        Init();
+    }
+
+    private void initParams(Context context, AttributeSet attrs) {
+        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.caidan_control);
+        if (typedArray != null) {
+            try {
+                ks_ys = typedArray.getResourceId(R.styleable.caidan_control_imagesrc, R.mipmap.silos1);
+                showbk = typedArray.getInt(R.styleable.caidan_control_showbk, -9999);
+                typedArray.recycle();
+            }catch (Exception exception)
+            {
+                Log.i("错误", exception.getMessage());
+            }
+
+        }
+    }
+
+    public void Init()
+    {
+        String str= this.getTag().toString();
+        if(!str.isEmpty())
+        {
+            text_u.setText(str);
+        }else
+        {
+            text_u.setText("");
+        }
+
+        image_u.setImageResource(ks_ys);
+
+        if(showbk!=-9999)
+        {
+            rea_main.setVisibility(View.GONE);
+        }
+    }
+}

app/src/main/res/layout/datatab/layout/liaochang_item.xml

@@ -23,7 +23,7 @@
             android:id="@+id/wuliaoimage"
             android:layout_width="160dp"
             android:layout_height="160dp"
-            android:src="@mipmap/liaochang_by"/>
+            android:src="@mipmap/newsilos"/>
         <TextView
             android:id="@+id/wuliaoname"
             android:layout_width="match_parent"
@@ -35,7 +35,7 @@
 
     <LinearLayout
         android:layout_marginTop="125dp"
-        android:layout_centerHorizontal="true"
+        android:layout_centerInParent="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
 
@@ -47,6 +47,22 @@
             android:text="30%"
             android:textSize="24dp" />
     </LinearLayout>
+    <LinearLayout
+        android:id="@+id/gaojing"
+        android:layout_marginTop="165dp"
+        android:layout_centerHorizontal="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:src="@mipmap/zhuyi"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="请补充物料"
+            android:textColor="@color/red_primary_dark"/>
+    </LinearLayout>
 
 
 </RelativeLayout>

app/src/main/res/layout/fragment_she_zhi.xml

@@ -20,12 +20,12 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
-                <com.bonait.bnframework.modules.home.fragment.mode.caidan_control
-                    android:id="@+id/plckz"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:imagesrc="@mipmap/plcjiankong"
-                    android:tag="PLC地址配置或控制"/>
+<!--                <com.bonait.bnframework.modules.home.fragment.mode.caidan_control-->
+<!--                    android:id="@+id/plckz"-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="match_parent"-->
+<!--                    app:imagesrc="@mipmap/plcjiankong"-->
+<!--                    android:tag="PLC地址配置或控制"/>-->
                 <com.bonait.bnframework.modules.home.fragment.mode.caidan_control
                     android:id="@+id/xtcs"
                     android:layout_width="match_parent"

app/src/main/res/layout/item/layout/dialog_add_manguan.xml

@@ -85,11 +85,12 @@
                                 android:layout_width="320dp"
                                 android:layout_height="320dp"
                                 android:src="@drawable/huanxing" />
+
                             <ImageView
-                                android:layout_centerInParent="true"
-                                android:clickable="false"
                                 android:layout_width="260dp"
                                 android:layout_height="260dp"
+                                android:layout_centerInParent="true"
+                                android:clickable="false"
                                 android:src="@drawable/zailaiyibei" />
                             <ImageView
                                 android:id="@+id/image_gz"

app/src/main/res/layout/item/layout/imagebuttomcontrol.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_weight="1"
+        android:layout_height="0dp">
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="@drawable/zailaiyibei">
+        </ImageView>
+
+        <ImageView
+            android:layout_margin="30dp"
+            android:id="@+id/caidan_image"
+            android:layout_marginTop="14dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerHorizontal="true"
+            android:src="@mipmap/silos1"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/rea_main"
+        android:layout_width="match_parent"
+        android:layout_height="40dp">
+        <TextView
+            android:id="@+id/caidan_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:text="基础数据管理"
+            android:textAlignment="center"
+            android:textColor="@color/black"
+            android:textSize="28dp" />
+    </RelativeLayout>
+
+
+</LinearLayout>