辅料名称改为锡膏

app/src/main/java/com/uas/rd_uaspda/bean/SolderOperateEntity.java

@@ -7,7 +7,7 @@ public class SolderOperateEntity implements MultiItemEntity {
     private String barcode;
     private String brand;
     private String spec;
-    private String status;//辅料状态（出库回温/已开封/开封回存/回温回存/已用尽/报废/空瓶退回）
+    private String status;//锡膏状态（出库回温/已开封/开封回存/回温回存/已用尽/报废/空瓶退回）
     private String rewarmingDate;//上次回温时间
     private String rewarmingTime;//上次回温时长
     private long restorecount;//回存次数

app/src/main/java/com/uas/rd_uaspda/fragment/SolderChargingFragment.java

@@ -7,9 +7,11 @@ import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -28,6 +30,7 @@ import com.uas.rd_uaspda.util.FastjsonUtil;
 import com.uas.rd_uaspda.util.HttpCallback;
 import com.uas.rd_uaspda.util.HttpParams;
 import com.uas.rd_uaspda.util.VolleyRequest;
+import com.uas.rd_uaspda.util.VollyRequest;
 import com.uas.rd_uaspda.view.ClearableEditText;
 import com.uas.rd_uaspda.view.business.CommonSelectPop;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
@@ -38,10 +41,11 @@ import java.util.List;
 
 /**
  * Created by RaoMeng on 2019/6/11
- * Desc: 辅料上料页面
+ * Desc: 锡膏上料页面
  */
 public class SolderChargingFragment extends BaseFragment {
     private static final int SCAN_BARCODE_CODE = 204;
+    private static final int SCAN_CT_CODE = 205;
     private ClearableEditText mBarcodeEditText, mLinecodeEditText, mMacodeEditText;
     private RecyclerView mRecyclerView;
     private CheckBox mCheckBox;
@@ -51,6 +55,9 @@ public class SolderChargingFragment extends BaseFragment {
     private ImageView mScanImageView, mLineSelectIv;
     private int mFocusId;
     private CommonSelectPop mLineSelectPop;
+    private ClearableEditText ct_id;
+    private ClearableEditText tv_pr_code;
+    private ClearableEditText tv_pr_detail;
 
     @Override
     protected int getLayout() {
@@ -59,7 +66,7 @@ public class SolderChargingFragment extends BaseFragment {
 
     @Override
     protected void initViews() {
-        setTitle("辅料上料");
+        setTitle("锡膏上料");
         ((FunctionActivity) getActivity()).setScanIvVisible(true);
 
         mScanImageView = (ImageView) mActivity.findViewById(R.id.btn_actionbar_scan_iv);
@@ -71,6 +78,9 @@ public class SolderChargingFragment extends BaseFragment {
         mConfirmButton = root.findViewById(R.id.solder_charging_confirm_btn);
         mLineSelectIv = root.findViewById(R.id.solder_charging_linecode_select_iv);
         mRecyclerView = root.findViewById(R.id.solder_charging_data_rv);
+        ct_id = root.findViewById(R.id.ct_id);
+        tv_pr_code = root.findViewById(R.id.tv_pr_code);
+        tv_pr_detail = root.findViewById(R.id.tv_pr_detail);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
         mCaptionValueBeans = new ArrayList<>();
         initFormList();
@@ -139,6 +149,70 @@ public class SolderChargingFragment extends BaseFragment {
                 mLineSelectPop.dismiss();
             }
         });
+
+
+
+        ct_id.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    String va_code = ct_id.getText().toString().trim();
+                    getfuzzySearchData(va_code,"");
+                    return true;
+                }
+                return false;
+            }
+        });
+
+
+
+
+
+
+
+
+    }
+    public void getfuzzySearchData(String inoutNo,String stop){
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_SMT_FUZZY_SEARCH)
+                .method(Request.Method.GET)
+                .addParam("inoutNo", inoutNo)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                try {
+                    JSONArray dataArrayone = FastjsonUtil.getJSONArray(o.toString(),"data");
+                    if (dataArrayone == null|| dataArrayone.size() == 0){
+                        CommonUtil.toastNoRepeat(mActivity,"未搜索到匹配数据");
+                    }
+                    for(Object index:dataArrayone){
+                        JSONObject data = (JSONObject) index;
+
+                        mMacodeEditText.setText(""+data.getString("MA_CODE"));
+                        tv_pr_code.setText(""+data.getString("PR_CODE"));
+                        tv_pr_detail.setText(""+data.getString("PR_DETAIL"));
+
+                    }
+                    mLinecodeEditText.requestFocus();
+                    mLinecodeEditText.setSelection(mLinecodeEditText.getText().toString().length());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+
+            }
+        });
     }
 
     private void requestLines() {
@@ -251,6 +325,8 @@ public class SolderChargingFragment extends BaseFragment {
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
+                ct_id.requestFocus();
+                ct_id.setSelection(ct_id.getText().toString().length());
             }
 
             @Override
@@ -271,7 +347,7 @@ public class SolderChargingFragment extends BaseFragment {
     private void initFormList() {
         mCaptionValueBeans.clear();
         mCaptionValueBeans.add(new CaptionValueBean("物料规格", ""));
-        mCaptionValueBeans.add(new CaptionValueBean("品牌", ""));
+        mCaptionValueBeans.add(new CaptionValueBean("供应商", ""));
         mCaptionValueBeans.add(new CaptionValueBean("出库时间", ""));
         mCaptionValueBeans.add(new CaptionValueBean("开盖时间", ""));
         mCaptionValueBeans.add(new CaptionValueBean("回温时长(H)", ""));

app/src/main/java/com/uas/rd_uaspda/fragment/SolderOperateFragment.java

@@ -155,7 +155,7 @@ public class SolderOperateFragment extends BaseFragment implements ISolderView {
     @Override
     public void title(String title, String button) {
         setTitle(title);
-        if ("辅料报废".equals(title)) {
+        if ("锡膏报废".equals(title)) {
             mReasonLinearLayout.setVisibility(View.VISIBLE);
         } else {
             mReasonLinearLayout.setVisibility(View.GONE);

app/src/main/java/com/uas/rd_uaspda/fragment/SolderPasteManageFragment.java

@@ -19,7 +19,7 @@ import java.util.List;
 
 /**
  * Created by RaoMeng on 2019/6/11
- * Desc: 辅料管理首页
+ * Desc: 锡膏管理首页
  */
 public class SolderPasteManageFragment extends BaseFragment {
     public static final int SOLDER_REWARM = 0x01;
@@ -41,7 +41,7 @@ public class SolderPasteManageFragment extends BaseFragment {
 
     @Override
     protected void initViews() {
-        setTitle("辅料管理");
+        setTitle("锡膏管理");
 
         mMenuRecyclerView = root.findViewById(R.id.solder_paste_manage_rv);
         mMenuRecyclerView.setLayoutManager(new GridLayoutManager(mActivity, 3));
@@ -49,14 +49,14 @@ public class SolderPasteManageFragment extends BaseFragment {
         mMenuBeanList = new ArrayList<>();
         mMenuBeanList.add(new CommonMenuBean("出库回温", R.drawable.ic_solder_rewarm,
                 SolderOperateFragment.class, createArgument(Constants.CONSTANT.EXTRA_WHICH_PAGE, SOLDER_REWARM)));
-        mMenuBeanList.add(new CommonMenuBean("辅料搅拌", R.drawable.ic_solder_recycle,
+        mMenuBeanList.add(new CommonMenuBean("锡膏搅拌", R.drawable.ic_solder_recycle,
                 SolderOperateFragment.class, createArgument(Constants.CONSTANT.EXTRA_WHICH_PAGE, SOLDER_MIXING)));
-        mMenuBeanList.add(new CommonMenuBean("辅料开盖", R.drawable.ic_solder_open,
+        mMenuBeanList.add(new CommonMenuBean("锡膏开盖", R.drawable.ic_solder_open,
                 SolderOperateFragment.class, createArgument(Constants.CONSTANT.EXTRA_WHICH_PAGE, SOLDER_OPEN)));
-        mMenuBeanList.add(new CommonMenuBean("辅料上料", R.drawable.ic_solder_charging, SolderChargingFragment.class));
-        mMenuBeanList.add(new CommonMenuBean("辅料回存", R.drawable.ic_solder_resave,
+        mMenuBeanList.add(new CommonMenuBean("锡膏上料", R.drawable.ic_solder_charging, SolderChargingFragment.class));
+        mMenuBeanList.add(new CommonMenuBean("锡膏回存", R.drawable.ic_solder_resave,
                 SolderOperateFragment.class, createArgument(Constants.CONSTANT.EXTRA_WHICH_PAGE, SOLDER_RESAVE)));
-        mMenuBeanList.add(new CommonMenuBean("辅料报废", R.drawable.ic_solder_scrap,
+        mMenuBeanList.add(new CommonMenuBean("锡膏报废", R.drawable.ic_solder_scrap,
                 SolderOperateFragment.class, createArgument(Constants.CONSTANT.EXTRA_WHICH_PAGE, SOLDER_SCRAP)));
         mMenuBeanList.add(new CommonMenuBean("空瓶回收", R.drawable.ic_solder_recycle,
                 SolderOperateFragment.class, createArgument(Constants.CONSTANT.EXTRA_WHICH_PAGE, SOLDER_RECYCLE)));
@@ -105,7 +105,7 @@ public class SolderPasteManageFragment extends BaseFragment {
     public void onHiddenChanged(boolean hidden) {
         super.onHiddenChanged(hidden);
         if (!hidden) {
-            setTitle("辅料管理");
+            setTitle("锡膏管理");
         }
     }
 

app/src/main/java/com/uas/rd_uaspda/global/GloableParams.java

@@ -641,7 +641,7 @@ public class GloableParams {
     public static final String GRIDNAME_STORAGE_MANAGER = "仓库管理";
     public static final String GRIDNAME_MSD_MANAGER = "MSD管理";
     public static final String GRIDNAME_SMTMATERIAL_ADD = "SMT上料";
-    public static final String GRIDNAME_SOLDER_MANAGER = "辅料管理";
+    public static final String GRIDNAME_SOLDER_MANAGER = "锡膏管理";
     public static final String GRIDNAME_SETTING = "设置";
     public static String[] indexMainGridNames = {GRIDNAME_INOUT_STORAGE, GRIDNAME_SHOPCONTENT,
             GRIDNAME_STORAGE_MANAGER, GRIDNAME_MSD_MANAGER, GRIDNAME_SMTMATERIAL_ADD,

app/src/main/java/com/uas/rd_uaspda/presenter/SolderOperatePresenter.java

@@ -2,6 +2,7 @@ package com.uas.rd_uaspda.presenter;
 
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -22,13 +23,14 @@ import java.util.List;
 
 /**
  * Created by RaoMeng on 2019/6/12
- * Desc: 辅料管理操作页面presenter类
+ * Desc: 锡膏管理操作页面presenter类
  */
 public class SolderOperatePresenter {
     public boolean isQuery;
 
     private ISolderView mSolderView;
     private int mWhichPage = 0;
+    private SolderOperateEntity operateEntitydata;
 
     public SolderOperatePresenter(Bundle argument, ISolderView solderView) {
         mSolderView = solderView;
@@ -50,13 +52,13 @@ public class SolderOperatePresenter {
                 mSolderView.title("出库回温", "确认出库");
                 break;
             case SolderPasteManageFragment.SOLDER_OPEN:
-                mSolderView.title("辅料开盖", "确认开盖");
+                mSolderView.title("锡膏开盖", "确认开盖");
                 break;
             case SolderPasteManageFragment.SOLDER_RESAVE:
-                mSolderView.title("辅料回存", "确认回存");
+                mSolderView.title("锡膏回存", "确认回存");
                 break;
             case SolderPasteManageFragment.SOLDER_SCRAP:
-                mSolderView.title("辅料报废", "确认报废");
+                mSolderView.title("锡膏报废", "确认报废");
                 break;
             case SolderPasteManageFragment.SOLDER_RECYCLE:
                 mSolderView.title("空瓶回收", "确认回收");
@@ -65,7 +67,7 @@ public class SolderOperatePresenter {
                 mSolderView.title("日志查询", null);
                 break;
             case SolderPasteManageFragment.SOLDER_MIXING:
-                mSolderView.title("辅料搅拌", "确认搅拌");
+                mSolderView.title("锡膏搅拌", "确认搅拌");
                 break;
         }
     }
@@ -200,14 +202,23 @@ public class SolderOperatePresenter {
         }
         StringBuilder barcodes = new StringBuilder();
         for (int i = 0; i < operateEntities.size(); i++) {
-            SolderOperateEntity operateEntity = operateEntities.get(i);
-            if (operateEntity != null && !TextUtils.isEmpty(operateEntity.getBarcode())) {
-                barcodes.append(operateEntity.getBarcode() + ",");
+            operateEntitydata = operateEntities.get(i);
+            if (operateEntitydata != null && !TextUtils.isEmpty(operateEntitydata.getBarcode())) {
+                if (operateEntities.size()>1){
+                    String stringdata = operateEntitydata.getBarcode() + ""+"|";
+                    String trim = stringdata.trim();
+                    barcodes.append(trim);
+                }else {
+                    Log.e("operateEntitydata1",operateEntitydata.getBarcode());
+                    barcodes.append(operateEntitydata.getBarcode() + ",");
+                }
+
             }
         }
         if (barcodes.length() > 0) {
             barcodes.deleteCharAt(barcodes.length() - 1);
         }
+        Log.e("operateEntitydata2",barcodes.toString());
         mSolderView.showLoad();
         String finalSuccessMsg = successMsg;
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()

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

@@ -35,7 +35,31 @@
 
         <TextView
             style="@style/inputItemCaption"
-            android:text="工单号" />
+            android:text="工单ID" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:padding="4dp"
+            android:text="*"
+            android:textColor="@color/red"
+            android:visibility="invisible" />
+
+        <com.uas.rd_uaspda.view.ClearableEditText
+            android:id="@+id/ct_id"
+            style="@style/inputItemValue"
+            android:hint="请采集工单ID" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:orientation="horizontal">
+
+        <TextView
+            style="@style/inputItemCaption"
+            android:layout_height="wrap_content"
+            android:text="计划单号" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -48,8 +72,65 @@
         <com.uas.rd_uaspda.view.ClearableEditText
             android:id="@+id/solder_charging_macode_et"
             style="@style/inputItemValue"
-            android:hint="请采集工单号" />
+            android:layout_height="30dp"
+            android:hint=""
+            android:enabled="false"/>
     </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:orientation="horizontal">
+
+        <TextView
+            style="@style/inputItemCaption"
+            android:layout_height="wrap_content"
+            android:text="产品编号" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:padding="4dp"
+            android:text="*"
+            android:textColor="@color/red"
+            android:visibility="invisible" />
+
+        <com.uas.rd_uaspda.view.ClearableEditText
+            android:id="@+id/tv_pr_code"
+            style="@style/inputItemValue"
+            android:layout_height="30dp"
+            android:enabled="false"
+            android:hint="" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:orientation="horizontal">
+
+        <TextView
+            style="@style/inputItemCaption"
+            android:layout_height="wrap_content"
+            android:text="产品名称" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:padding="4dp"
+            android:text="*"
+            android:textColor="@color/red"
+            android:visibility="invisible" />
+
+        <com.uas.rd_uaspda.view.ClearableEditText
+            android:id="@+id/tv_pr_detail"
+            style="@style/inputItemValue"
+            android:layout_height="30dp"
+            android:enabled="false"
+            android:hint="" />
+    </LinearLayout>
+
+
+
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -95,7 +176,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:checked="false"
-        android:text="本次本瓶用完" />
+        android:text="本次本瓶用完"
+        android:visibility="gone"/>
 
     <Button
         android:id="@+id/solder_charging_confirm_btn"

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

@@ -31,7 +31,7 @@
 
         <TextView
             style="@style/CaptionText"
-            android:text="品牌：" />
+            android:text="供应商：" />
 
         <TextView
             android:id="@+id/item_solder_empty_recycle_brand_tv"

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

@@ -31,7 +31,7 @@
 
         <TextView
             style="@style/CaptionText"
-            android:text="品牌：" />
+            android:text="供应商：" />
 
         <TextView
             android:id="@+id/item_solder_mixing_brand_tv"

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

@@ -31,7 +31,7 @@
 
         <TextView
             style="@style/CaptionText"
-            android:text="品牌：" />
+            android:text="供应商：" />
 
         <TextView
             android:id="@+id/item_solder_open_brand_tv"

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

@@ -31,7 +31,7 @@
 
         <TextView
             style="@style/CaptionText"
-            android:text="品牌：" />
+            android:text="供应商：" />
 
         <TextView
             android:id="@+id/item_solder_resave_brand_tv"

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

@@ -31,7 +31,7 @@
 
         <TextView
             style="@style/CaptionText"
-            android:text="品牌：" />
+            android:text="供应商：" />
 
         <TextView
             android:id="@+id/item_solder_rewarm_brand_tv"

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

@@ -31,7 +31,7 @@
 
         <TextView
             style="@style/CaptionText"
-            android:text="品牌：" />
+            android:text="供应商：" />
 
         <TextView
             android:id="@+id/item_solder_scrap_brand_tv"

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="my_app_name">辅料管理</string>
+    <string name="my_app_name">锡膏管理</string>
     <string name="my_app_name_test">睿德</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
@@ -56,7 +56,7 @@
     <string name="text_fragment_chin_root">深圳市优软科技有限公司</string>
     <string name="text_fragment_eng_root">Copyright @ 2019 All Rights Reserved</string>
     <!--Main Menu-->
-    <string name="title_activity_menu">辅料管理</string>
+    <string name="title_activity_menu">锡膏管理</string>
     <string name="title_activity_function">FunctionActivity</string>
     <!--InMakeMaterial-->
     <string name="text_search_fragment_inmake">出入库单号</string>