SMT作业设备增加贴条码功能,联调SMT功能接口

app/src/main/java/com/uas/baigang_workshop_workstation/fragment/SCSMTFragment.java

@@ -22,6 +22,7 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
 import com.android.volley.AuthFailureError;
 import com.android.volley.DefaultRetryPolicy;
 import com.android.volley.Request;
@@ -37,8 +38,11 @@ import com.uas.baigang_workshop_workstation.tools.SharedPreUtil;
 import com.uas.baigang_workshop_workstation.tools.VolleyUtil;
 import com.uas.baigang_workshop_workstation.util.CommonUtil;
 import com.uas.baigang_workshop_workstation.util.Constants;
+import com.uas.baigang_workshop_workstation.util.HttpCallback;
+import com.uas.baigang_workshop_workstation.util.HttpParams;
 import com.uas.baigang_workshop_workstation.util.JsonUtils;
 import com.uas.baigang_workshop_workstation.util.MyArrayAdapter;
+import com.uas.baigang_workshop_workstation.util.VolleyRequest;
 import com.uas.baigang_workshop_workstation.view.ClearableEditText;
 import com.uas.baigang_workshop_workstation.view.ConfirmDialog;
 
@@ -63,7 +67,7 @@ public class SCSMTFragment extends BaseFragment implements View.OnClickListener,
 
     private ClearableEditText etLineCode;
     private AutoCompleteTextView etJobCode;
-    private RadioGroup mBoardRadioGroup;
+    private RadioGroup mBoardRadioGroup,rg_tietiaoma;
     private RadioButton mARadioButton, mBRadioButton,mCRadioButton;
     Context context;
     private TextView tvNotice;
@@ -79,6 +83,7 @@ public class SCSMTFragment extends BaseFragment implements View.OnClickListener,
     private MyArrayAdapter<String> mAutoStringAdapter;
     private boolean mIgnoreFocusChange = false;
     private String mCacheLine = "";
+    private String isPasteBarcode = "";
 
     @Override
     protected int getLayout() {
@@ -99,6 +104,7 @@ public class SCSMTFragment extends BaseFragment implements View.OnClickListener,
         mCRadioButton = (RadioButton) root.findViewById(R.id.smt_feeder_C_rb);
         mOrderCheckBox = (CheckBox) root.findViewById(R.id.smt_feeder_order_cb);
         mJobsTitleTextView = (TextView) root.findViewById(R.id.smt_feeder_job_title_tv);
+        rg_tietiaoma = root.findViewById(R.id.rg_tietiaoma);
 
         etLineCode.requestFocus();
 
@@ -116,6 +122,16 @@ public class SCSMTFragment extends BaseFragment implements View.OnClickListener,
         mConfirmButton.setOnClickListener(this);
         etJobCode.addTextChangedListener(this);
         mBoardRadioGroup.setOnCheckedChangeListener(this);
+
+        rg_tietiaoma.setOnCheckedChangeListener((group, checkedId) -> {
+            if (checkedId == R.id.rb_yes) {
+                isPasteBarcode = "是";
+            } else if (checkedId == R.id.rb_no) {
+                isPasteBarcode = "否";
+            }
+            Log.e("aaa","贴条码:" + isPasteBarcode);
+        });
+
         mCleanIv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -184,19 +200,21 @@ public class SCSMTFragment extends BaseFragment implements View.OnClickListener,
             }
         });
 
-//        etJobCode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-//            @Override
-//            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-//                if (actionId == EditorInfo.IME_ACTION_SEND
-//                        || actionId == EditorInfo.IME_ACTION_DONE
-//                        || actionId == EditorInfo.IME_ACTION_GO
-//                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-//                    disposeClick();
-//                    return true;
-//                }
-//                return false;
-//            }
-//        });
+        etJobCode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_SEND
+                        || actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_GO
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    //disposeClick();
+                    String trim = etJobCode.getText().toString().trim();
+                    getPasteBarcodeData(trim,isPasteBarcode);
+                    return true;
+                }
+                return false;
+            }
+        });
 
         mOrderCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
@@ -214,7 +232,40 @@ public class SCSMTFragment extends BaseFragment implements View.OnClickListener,
                 }
             }
         });
+    }
+
+    private void getPasteBarcodeData(String wo,String isPasteBarcode) {
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_GET_PASTE_BARCODE)
+                        .method(Request.Method.POST)
+                        .addParam("wo",wo)
+                        .addParam("res", isPasteBarcode)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        String result = o.toString();
+                        com.alibaba.fastjson.JSONObject resultObject = JSON.parseObject(result);
+                        com.alibaba.fastjson.JSONObject dataObject = resultObject.getJSONObject("data");
+                        if (dataObject != null) {
+                            String pr_tm_user = dataObject.getString("PR_TM_USER");
+                            if (pr_tm_user.equals("是")) {
+                                rg_tietiaoma.check(R.id.rb_ok);
+                            }else if (pr_tm_user.equals("否")){
+                                rg_tietiaoma.check(R.id.rb_no);
+                            }
+                        }
+                        progressDialog.dismiss();
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
 
+                });
     }
 
     /**
@@ -577,6 +628,8 @@ public class SCSMTFragment extends BaseFragment implements View.OnClickListener,
 
     @Override
     public void onClick(View v) {
+        String trim = etJobCode.getText().toString().trim();
+        getPasteBarcodeData(trim,isPasteBarcode);
 //        disposeClick();
 //        confirmDevice();
         String lineCode = etLineCode.getText().toString().trim();

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

@@ -378,8 +378,7 @@ public class GloableParams {
     public static String ADDRESS_SEND_NOTIFY;    //报工---报工推送
     public static String ADD_GET_PERSONNEL_ID;        //获取人员编号接口
 
-
-
+    public static String ADDRESS_GET_PASTE_BARCODE;        //SMT作业设备--工单enter
 
 
     //连接服务器请求地址
@@ -791,8 +790,8 @@ public class GloableParams {
     //下载附件
     private static final String ADDRESSTAIL_COMMON_DOWNLOADBYID = "/common/downloadbyId.action";
     //获取应用版本信息
-        private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/outMaterial/getPdaVersion.action";
-//    private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/getPdaVersion.action";
+    private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/outMaterial/getPdaVersion.action";
+    //    private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/getPdaVersion.action";
 
     //工单流水
     private static final String ADDRESSTAIL_GET_MAKEMAN = "/api/pdashop/source/getMakeMan.action";
@@ -819,8 +818,8 @@ public class GloableParams {
 
     private static final String ADDRESSTAIL_FUZZYSEARCHMOULD = "/api/pdashop/start/fuzzySearchMould.action";
 
-    public static String ADDRESSTAIL_GET_JUMP_STEP="/api/pdashop/special/getJumpStep.action";
-    public static String ADDRESSTAIL_GET_BAD_CODE_LIST="/api/pdashop/makebad/getBadCodeList.action";
+    public static String ADDRESSTAIL_GET_JUMP_STEP = "/api/pdashop/special/getJumpStep.action";
+    public static String ADDRESSTAIL_GET_BAD_CODE_LIST = "/api/pdashop/makebad/getBadCodeList.action";
     //工单启动列表查询
     private static final String ADDRESSTAIL_PDA_GETSHOPPLAN = "/api/pdashop/start/getShopPlan.action";
 
@@ -864,8 +863,8 @@ public class GloableParams {
     private static final String ADDRESSTAIL_COUNTING_STEPIN = "/api/pdashop/stepIn.action";
 
     //拆批
-    public static String ADDRESSTAIL_GET_SPLIT_LOTNO="/api/pdashop/special/getSplitLotno.action";
-    public static String ADDRESSTAIL_SPLIT_LOTNO="/api/pdashop/special/splitLotno.action";
+    public static String ADDRESSTAIL_GET_SPLIT_LOTNO = "/api/pdashop/special/getSplitLotno.action";
+    public static String ADDRESSTAIL_SPLIT_LOTNO = "/api/pdashop/special/splitLotno.action";
     //上料汇总列表
     private static final String ADDRESSTAIL_PDASHOP_GETLOADINGDATAGROUPPROD = "/api/pdashop/loading/getLoadingDataGroupProd.action";
     //获取报工详情
@@ -899,7 +898,7 @@ public class GloableParams {
     //入库条码解析
     private static final String ADDRESSTAIL_JLT_RECEIVING_BARCODEPARSE = "/api/pda/receiving/barcodeParse.action";
     //入库扫描保存
-    private static final String ADDRESSTAIL_PDAIO_PUT_SAVEBARCODE2CONFIRM="/api/pda/receiving/saveBarcode2Confirm.action";
+    private static final String ADDRESSTAIL_PDAIO_PUT_SAVEBARCODE2CONFIRM = "/api/pda/receiving/saveBarcode2Confirm.action";
     //入库采集
     private static final String ADDRESSTAIL_RECEIVING_SAVEBARCODE2 = "/api/pda/receiving/saveBarcode2.action";
 
@@ -907,7 +906,7 @@ public class GloableParams {
     private static final String ADDRESSTAIL_PDAIO_CONFIRMPOST = "/api/pdaio/pdaioIn/confirmPost.action";
     private static final String ADDRESSTAIL_RECEIVING_NEWBAOCODEIO = "/api/pda/receiving/newBaocodeio.action";
     //入库扫描已采集列表长按删除
-    private static final String ADDRESSTAIL_PDAIO_GET_lOGINDELETE="/api/pda/receiving/deleteAllBarDetails.action";
+    private static final String ADDRESSTAIL_PDAIO_GET_lOGINDELETE = "/api/pda/receiving/deleteAllBarDetails.action";
 
     //已拣列表
     private static final String ADDRESSTAIL_OUTMATERIAL_GETPICKEDLIST = "/api/pda/outMaterial/getPickedList.action";
@@ -916,7 +915,7 @@ public class GloableParams {
 
     private static final String ADDRESSTAIL_JLT_RECEIVING_GETNEEDLIST = "/api/pda/receiving/getNeedList.action";
     //入库待采提示
-    private static final String ADDRESSTAIL_PDAIO_GET_TOADOPTPROMPT="/api/pda/receiving/getNeedList2.action";
+    private static final String ADDRESSTAIL_PDAIO_GET_TOADOPTPROMPT = "/api/pda/receiving/getNeedList2.action";
 
     private static final String ADDRESSTAIL_DELIVERYORDERDETAIL = "/api/pda/receiving/makeCollectList.action";
 
@@ -987,7 +986,10 @@ public class GloableParams {
     private static final String ADDRESSTAIL_SEND_NOTIFY = "/api/pdashop/start/sendNotify.action";
 
     //人员编号
-    public static String ADDRESSTAIL_GET_PERSONNEL_ID="/api/pda/spm/getEmployee.action";
+    public static String ADDRESSTAIL_GET_PERSONNEL_ID = "/api/pda/spm/getEmployee.action";
+
+    //SMT作业设备--工单enter
+    public static String ADDRESSTAIL_GET_PASTE_BARCODE = "/api/pda/shopFloorManage/updateIsSn.action";
 
 
     /**
@@ -1019,14 +1021,14 @@ public class GloableParams {
     public static final String OBTAIN_RANKING_CHART = "获取排位图";
 
     public static String[] indexMainGridNames = {
-//            GRIDNAME_INOUT_STORAGE,
-//            GRIDNAME_SHOPCONTENT,
-//            GRIDNAME_STORAGE_MANAGER,
+            //            GRIDNAME_INOUT_STORAGE,
+            //            GRIDNAME_SHOPCONTENT,
+            //            GRIDNAME_STORAGE_MANAGER,
             GRIDNAME_POST_STOCK,
             GRIDNAME_MODIFY_QUANTITY2,
-//            GRIDNAME_MSD_MANAGER,
+            //            GRIDNAME_MSD_MANAGER,
             GRIDNAME_SMTMATERIAL_ADD,
-//            GRIDNAME_SOLDER_MANAGER,
+            //            GRIDNAME_SOLDER_MANAGER,
             POSTPUNCH,
             HOME_DISPATCH_MANAGE,
             FINISHED_PRODUCT_STORAGE,
@@ -1034,13 +1036,13 @@ public class GloableParams {
             GRIDNAME_SETTING
     };
     public static int[] indexMainGridImgs = {
-//            R.drawable.mainmenu_outinstorage,
+            //            R.drawable.mainmenu_outinstorage,
             R.drawable.mainmenu_workhousemanager,
-//            R.drawable.mainmenu_storehousemanager,
+            //            R.drawable.mainmenu_storehousemanager,
             R.drawable.ic_modify_quantity,
-//            R.drawable.storage_msd_manager,
+            //            R.drawable.storage_msd_manager,
             R.drawable.ic_smt_feed,
-//            R.drawable.ic_solder_manage,
+            //            R.drawable.ic_solder_manage,
             R.drawable.iv_postpunch,
             R.drawable.ic_dispatch_manage,
             R.drawable.ic_finished_product_storage,
@@ -1054,8 +1056,8 @@ public class GloableParams {
     public static final String GRIDNAME_WORK_SWITCH = "工单切换";
     public static final String GRIDNAME_IN_MATERIAL = "接料";
 
-    public static final String GRIDNAME__PUTINTO= "工序投入";
-    public static final String GRIDNAME_ROLLOUT= "工序转出";
+    public static final String GRIDNAME__PUTINTO = "工序投入";
+    public static final String GRIDNAME_ROLLOUT = "工序转出";
     public static final String GRIDNAME_TIME_REPORT_DETAIL = "产出明细";
     public static final String GRIDNAME_TIME_METRIAL_DETAIL = "在制明细";
     public static final String GRIDNAME_TIME_REPORT = "报工";
@@ -1162,11 +1164,11 @@ public class GloableParams {
             LISTNAME_FEEDER_SWITCH,
             LISTNAME_FEEDER_CHECK,
             LISTNAME_FEEDER_MACHINE,
-//            LISTNAME_REQUEST_MACHINE,
+            //            LISTNAME_REQUEST_MACHINE,
             LISTNAME_LOCATION_QUERY,
-//            LISTNAME_PREMATERIAL_QUERY,
-//            LISTNAME_FEEDER_BIND,
-//            LISTNAME_FEEDER_UNBIND,
+            //            LISTNAME_PREMATERIAL_QUERY,
+            //            LISTNAME_FEEDER_BIND,
+            //            LISTNAME_FEEDER_UNBIND,
             LISTNAME_FEEDER_CHECKINSPECTION
     };
     public static final int[] feederListImgs = {
@@ -1178,11 +1180,11 @@ public class GloableParams {
             R.drawable.index_smt_switch,
             R.drawable.index_smt_check,
             R.drawable.index_smt_machine,
-//            R.drawable.index_smt_request,
+            //            R.drawable.index_smt_request,
             R.drawable.index_location_query,
-//            R.drawable.index_prematerial_query,
-//            R.drawable.index_prematerial_query,
-//            R.drawable.index_smt_query,
+            //            R.drawable.index_prematerial_query,
+            //            R.drawable.index_prematerial_query,
+            //            R.drawable.index_smt_query,
             R.drawable.index_smt_check};
 
     //-->入库管理
@@ -1558,12 +1560,12 @@ public class GloableParams {
 
         GloableParams.ADDRESS_PUTMATERIAL_TOADOPTPROMPT = uriHead + GloableParams.ADDRESSTAIL_PDAIO_GET_TOADOPTPROMPT;
 
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_DELIVERYORDERDETAIL= uriHead + GloableParams.ADDRESSTAIL_DELIVERYORDERDETAIL;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_DELIVERYORDERDETAIL = uriHead + GloableParams.ADDRESSTAIL_DELIVERYORDERDETAIL;
 
         GloableParams.ADDRESS_INVENTORY_SUBMIT = uriHead + GloableParams.ADDRESSTAIL_INVENTORY_SUBMIT;
         GloableParams.ADDRESS_DOCUMENT_DETAILS = uriHead + GloableParams.ADDRESSTAIL_DOCUMENT_DETAILS;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_MAKECOLLECTBOXLIST= uriHead + GloableParams.ADDRESSTAIL_MAKECOLLECTBOXLIST;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_MAKEINWARHOUSE= uriHead + GloableParams.ADDRESSTAIL_MAKEINWARHOUSE;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_MAKECOLLECTBOXLIST = uriHead + GloableParams.ADDRESSTAIL_MAKECOLLECTBOXLIST;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_MAKEINWARHOUSE = uriHead + GloableParams.ADDRESSTAIL_MAKEINWARHOUSE;
 
         GloableParams.ADDRESS_JLT_RECEIVING_CHECKOUTBOX = uriHead + GloableParams.ADDRESSTAIL_JLT_RECEIVING_CHECKOUTBOX;
 
@@ -1600,18 +1602,7 @@ public class GloableParams {
         GloableParams.ADDRESS_SEND_NOTIFY = uriHead + GloableParams.ADDRESSTAIL_SEND_NOTIFY;
         GloableParams.ADD_GET_PERSONNEL_ID = uriHead + GloableParams.ADDRESSTAIL_GET_PERSONNEL_ID;
 
-
-
-
-
-
-
-
-
-
-
-
-
+        GloableParams.ADDRESS_GET_PASTE_BARCODE = uriHead + GloableParams.ADDRESSTAIL_GET_PASTE_BARCODE;
 
 
     }

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

@@ -34,7 +34,9 @@
         android:layout_marginTop="12dp"
         android:enabled="false"
         android:text="确认登记"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:visibility="visible"
+        />
 
     <TextView
         android:id="@+id/msd_vacuum_seal_result_tv"

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

@@ -134,9 +134,49 @@
                         android:text="C面" />
                 </RadioGroup>
             </TableRow>
+
+            <TableRow
+                android:layout_marginTop="5dp"
+                android:background="@color/white">
+
+                <TextView
+                    style="@style/tl_tv_style"
+                    android:layout_height="43dp"
+                    android:gravity="center"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"
+                    android:text="贴条码"
+                    android:textColor="@color/body_text_1"
+                    android:textSize="16sp" />
+
+                <RadioGroup
+                    android:id="@+id/rg_tietiaoma"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/rb_yes"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="是" />
+
+                    <RadioButton
+                        android:id="@+id/rb_no"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="否" />
+
+                </RadioGroup>
+            </TableRow>
         </TableLayout>
 
         <TextView
+            android:layout_marginTop="5dp"
             android:id="@+id/tv_notice_smt"
             style="@style/CardContentTextStyle"
             android:layout_marginLeft="@dimen/space_left_16"

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

@@ -19,7 +19,6 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
             android:orientation="vertical">
 
             <TextView
@@ -28,7 +27,6 @@
                 android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/dp_10"
                 android:layout_marginRight="@dimen/dp_10"
-                android:gravity="center"
                 android:text="11234123ee21234er"/>
 
             <TextView
@@ -37,7 +35,6 @@
                 android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/dp_10"
                 android:layout_marginRight="@dimen/dp_10"
-                android:gravity="center"
                 android:text="11234123ee21234er"/>
 
             <TextView
@@ -46,7 +43,6 @@
                 android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/dp_10"
                 android:layout_marginRight="@dimen/dp_10"
-                android:gravity="center"
                 android:text="11234123ee21234er"/>
 
             <TextView
@@ -55,7 +51,6 @@
                 android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/dp_10"
                 android:layout_marginRight="@dimen/dp_10"
-                android:gravity="center"
                 android:text="11234123ee21234er"/>
 
             <TextView
@@ -65,7 +60,6 @@
                 android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/dp_10"
                 android:layout_marginRight="@dimen/dp_10"
-                android:gravity="center"
                 android:text="11234123ee21234er"/>
         </LinearLayout>
 

build.gradle

@@ -64,8 +64,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 19,
-            versionName      : "v1.1.8"
+            versionCode      : 20,
+            versionName      : "v1.1.9"
     ]
 
     depsVersion = [