修改生产信息绑定岗位人员赋值问题，增加发放单据列表

app/src/main/java/com/uas/rd_equipment/activity/FunctionActivity.java

@@ -13,10 +13,10 @@ import android.widget.TextView;
 
 import com.android.volley.toolbox.StringRequest;
 import com.uas.rd_equipment.R;
-import com.uas.rd_equipment.fragment.AddEquipmentGrantFragment;
 import com.uas.rd_equipment.fragment.BaseFragment;
 import com.uas.rd_equipment.fragment.BreakdownRepairFragment;
 import com.uas.rd_equipment.fragment.DeliveryForRepairFragment;
+import com.uas.rd_equipment.fragment.DeviceProvisioningListFragment;
 import com.uas.rd_equipment.fragment.DeviceStatusChangeFragment;
 import com.uas.rd_equipment.fragment.IndexSettingFragment;
 import com.uas.rd_equipment.fragment.MaterialAndToolingReturnFragment;
@@ -111,7 +111,7 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                     mFragment = new RemouIdRepairFragment();
                     break;
                 case GloableParams.PRODUCTION_REMOULD_GRAN://物料工装发放
-                    mFragment = new AddEquipmentGrantFragment();
+                    mFragment = new DeviceProvisioningListFragment();
                     break;
                 case GloableParams.PRODUCTION_REMOULD_PROGRAMSELECT://问题缉查列表
                     mFragment = new ProblemDetectionListFragment();

app/src/main/java/com/uas/rd_equipment/bean/MakerecordBean.java

@@ -15,6 +15,15 @@ public class MakerecordBean {
     private String PR_DETAIL;
     private String MBR_DELETE;
     private String MBR_OUTQTY;
+    private String MBR_LINECODE;
+
+    public String getMBR_LINECODE() {
+        return MBR_LINECODE;
+    }
+
+    public void setMBR_LINECODE(String MBR_LINECODE) {
+        this.MBR_LINECODE = MBR_LINECODE;
+    }
 
     public String getMBR_OUTQTY() {
         return MBR_OUTQTY;

app/src/main/java/com/uas/rd_equipment/fragment/AddEquipmentGrantFragment.java

@@ -94,7 +94,7 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
     private PopupWindow mMenuPopupWindow;
     private Fragment mFragment;
     private SmartTable mSmartTable;
-    private Column<String> va_classColumn,va_codeColumn,va_vendnameColumn,va_vendcodeColumn,va_inmancolumn,va_DELETEColumn;
+    private Column<String> va_classColumn,va_linecodeColumn,va_codeColumn,va_vendnameColumn,va_vendcodeColumn,va_inmancolumn,va_DELETEColumn;
     private TableData<MakerecordBean> mTableData;
     private List<MakerecordBean> mFilterStorageInBeans;
     private ImageView mScanImageView;
@@ -143,6 +143,9 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
     private String dc_code;
     private String dc_status;
     private ImageView mListImageView;
+    private boolean dc_boolean_code = false;
+    private AutoCompleteTextView tv_ma_linecode;
+    private String dc_linecode;
 
     @Override
     protected int getLayout() {
@@ -171,6 +174,7 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
         iv_dc_emcode = root.findViewById(R.id.iv_dc_emcode);
         tv_dc_emname = root.findViewById(R.id.tv_dc_emname);
         work_code_code = root.findViewById(R.id.work_code_code);
+        tv_ma_linecode = root.findViewById(R.id.tv_ma_linecode);
         masterSpinner = (Spinner) root.findViewById(R.id.sp_login);
         shaopwork_id = root.findViewById(R.id.shaopwork_id);
         tv_dc_emcode_delete = root.findViewById(R.id.tv_dc_emcode_delete);
@@ -191,11 +195,13 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
         if (arguments != null){
             dc_code = arguments.getString("dc_code");
             dc_status = arguments.getString("dc_status");
+            dc_linecode = arguments.getString("dc_linecode");
+            tv_ma_linecode.setText(dc_linecode);
             if (!StringUtil.isEmpty(dc_status)){
                 if (dc_status.equals("在录入")){
                     tv_save.setEnabled(false);
                     tv_confirm_receipt.setEnabled(true);
-
+                    dc_boolean_code=true;
                 }else {
                     tv_save.setEnabled(false);
                     tv_confirm_receipt.setEnabled(false);
@@ -250,6 +256,7 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
 
         va_vendnameColumn = new Column<String>("编号", "MBR_BARCODE");
         va_vendnameColumn.setFixed(true);
+        va_linecodeColumn = new Column<String>("线别", "MBR_LINECODE");
         va_vendcodeColumn = new Column<String>("名称", "PR_DETAIL");
         va_codeColumn = new Column<String>("日期", "MBR_INDATE");
         va_inmancolumn = new Column<String>("人员", "MBR_INMAN");
@@ -721,6 +728,7 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
                                 MakerecordBean jltStorageInBean = new MakerecordBean();
                                 jltStorageInBean.setMBR_ID(FastjsonUtil.getText(dataObject, "MBR_ID"));
                                 jltStorageInBean.setMBR_BARCODE(FastjsonUtil.getText(dataObject, "MBR_BARCODE"));
+                                jltStorageInBean.setMBR_LINECODE(FastjsonUtil.getText(dataObject, "MBR_LINECODE"));
                                 jltStorageInBean.setMBR_PRODCODE(FastjsonUtil.getText(dataObject, "MBR_PRODCODE"));
                                 jltStorageInBean.setMBR_MAKECODE(FastjsonUtil.getText(dataObject, "MBR_MAKECODE"));
                                 jltStorageInBean.setMBR_OUTQTY(FastjsonUtil.getText(dataObject, "MBR_OUTQTY"));
@@ -831,6 +839,7 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
 
 
         object_1.put("MBR_MAKECODE", ce_work_codetrim);//工单号
+        object_1.put("MBR_LINECODE", tv_ma_linecode.getText().toString().trim());//工单号
         object_1.put("MBR_TYPE", rb_changetext);//设备\夹具\辅料
         object_1.put("MBR_PRODCODE", tv_pr_code.getText());//产品编号
         object_1.put("MBR_INMAN", tv_dc_emname.getText());//人员名称
@@ -940,6 +949,7 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
         }
 
     }
+
     public void getNewCommitData(){
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
@@ -956,8 +966,9 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
                 String result = o.toString();
                 JSONObject resultObject = JSON.parseObject(result);
                 JSONObject dataObject = resultObject.getJSONObject("items");
-                String de_name = FastjsonUtil.getText(dataObject, "dc_code");
-                tv_grantcode.setText(de_name);
+                String dc_code = FastjsonUtil.getText(dataObject, "dc_code");
+                tv_grantcode.setText(dc_code);
+                dc_boolean_code=true;
                 tv_save.setEnabled(false);
                 tv_confirm_receipt.setEnabled(true);
             }
@@ -976,6 +987,10 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
 
     //确认领用
     public void getOKTconfirmReceipt(){
+        if (!dc_boolean_code){
+            CommonUtil.toastNoRepeat(mActivity, "已领用");
+            return;
+        }
         String tv_grantcodetrim = tv_grantcode.getText().toString().trim();
         if (tv_grantcodetrim.isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "单据编号为空");
@@ -994,6 +1009,8 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.GREEN);
                 tv_prompt.setText("领用成功");
+                CommonUtil.toastYESRepeat(mActivity, "领用成功");
+                dc_boolean_code=false;
 
             }
 
@@ -1010,6 +1027,7 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
     }
 
     public void getNewCommitpost(){
+
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ASTATIONTHE_SELECT_POST)
@@ -1034,7 +1052,7 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
 
     private void setFilterTableData(List<MakerecordBean> filterTableData) {
         mTableData = new TableData<MakerecordBean>("收料单列表", filterTableData,
-                va_vendnameColumn,va_vendcodeColumn,va_codeColumn,va_inmancolumn,va_classColumn,va_DELETEColumn);
+                va_vendnameColumn,va_linecodeColumn,va_vendcodeColumn,va_codeColumn,va_inmancolumn,va_classColumn,va_DELETEColumn);
         mSmartTable.setTableData(mTableData);
 //        mSmartTable.requestLayout();
         mSmartTable.postDelayed(new Runnable() {

app/src/main/java/com/uas/rd_equipment/fragment/BreakdownRepairFragment.java

@@ -147,8 +147,8 @@ public class BreakdownRepairFragment extends BaseFragment{
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = new JSONArray();
         JSONObject object_1 = new JSONObject();
-        object_1.put("dc_reason", index_fault_phenomenon.getText().toString().trim());//备注
-        object_1.put("dc_remark", index_position_resource.getText().toString().trim());
+        object_1.put("dc_reason", index_fault_phenomenon.getText().toString().trim());
+        object_1.put("dc_remark", index_position_resource.getText().toString().trim());//备注
         jsonArray.add(object_1);
         jsonObject.put("formStore", jsonArray);
         VollyRequest.getInstance().stringRequest(new HttpParams.Builder()

app/src/main/java/com/uas/rd_equipment/fragment/DeviceProvisioningListFragment.java

@@ -335,12 +335,14 @@ public class DeviceProvisioningListFragment extends BaseFragment implements OnCo
         String dc_id = mFilterStorageInBeans.get(position).getDC_ID();
         String dc_devcode = mFilterStorageInBeans.get(position).getDC_DEVCODE();
         String dc_status = mFilterStorageInBeans.get(position).getDC_STATUS();
+        String dc_linecode = mFilterStorageInBeans.get(position).getDC_LINECODE();
         AddEquipmentGrantFragment outboundListAdd_fragment = new AddEquipmentGrantFragment();
         Bundle bundle = new Bundle();
         bundle.putString("dc_code", dc_code);
         bundle.putString("dc_id", dc_id);
         bundle.putString("dc_devcode", dc_devcode);
         bundle.putString("dc_status", dc_status);
+        bundle.putString("dc_linecode", dc_linecode);
         outboundListAdd_fragment.setArguments(bundle);
         FragmentUtils.switchFragment(DeviceProvisioningListFragment.this, outboundListAdd_fragment);
     }

app/src/main/java/com/uas/rd_equipment/fragment/ProduceMassageBindingFragment.java

@@ -949,6 +949,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
                 ce_resources.setText("");
                 inputString="";
                 storage_recharge_collect_et.setText("");
+                list.clear();
             }
 
             @Override

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

@@ -150,7 +150,59 @@
 
         </TableRow>
 
+        <TableRow
+            android:layout_marginTop="5dp">
+
+            <TextView
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="线别"
+                android:layout_gravity="center"
+                android:textColor="@color/black">
+            </TextView>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/textsize_16"
+                android:layout_marginRight="@dimen/textsize_16"
+                >
+
+                <FrameLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1">
+
+                    <AutoCompleteTextView
+                        android:id="@+id/tv_ma_linecode"
+                        style="@style/EditTextLineStyle"
+                        android:layout_height="30dp"
+                        android:hint="请输入线别" />
+
+                    <ImageView
+                        android:id="@+id/linecode_smts"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center|right"
+                        android:layout_marginRight="13dp"
+                        android:src="@drawable/wrong"
+                        android:visibility="gone" />
+                </FrameLayout>
+                <ImageView
+                    android:id="@+id/slinecode_id"
+                    android:layout_width="30dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:clickable="false"
+                    android:src="@drawable/ic_edittext_scan" />
+            </LinearLayout>
+
+
+
 
+        </TableRow>
         <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
@@ -217,7 +269,6 @@
 
             </LinearLayout>
 
-
         </LinearLayout>
         <LinearLayout
             android:layout_gravity="center"
@@ -361,23 +412,25 @@
             android:id="@+id/rb_equipment"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/dp_10"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
             android:text="设备">
         </RadioButton>
         <RadioButton
             android:id="@+id/rb_fixture"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/dp_10"
-            android:layout_weight="1"
+            android:layout_height="wrap_content" android:layout_weight="1"
             android:checked="true"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
             android:text="夹具">
         </RadioButton>
         <RadioButton
             android:id="@+id/rb_ingredients"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/dp_10"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
             android:text="辅料">
         </RadioButton>
     </RadioGroup>

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

@@ -385,7 +385,7 @@
     <string name="main_list">领用转移列表</string>
     <string name="problem_list">问题缉查列表</string>
     <string name="mt_return">设备夹具辅料归还</string>
-    <string name="grant_list">物料工装发放</string>
+    <string name="grant_list">发放单据列表</string>
     <string name="producemassagebinding">生产信息绑定</string>
     <string name="addequipmentgrant">设备夹具辅料发放</string>
     <string name="str_collect_already">已采集</string>

build.gradle

@@ -58,8 +58,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 14,
-            versionName      : "v1.0.4"
+            versionCode      : 17,
+            versionName      : "v1.0.7"
     ]
 
     depsVersion = [

pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/debug/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -13,6 +13,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 13;
-  public static final String VERSION_NAME = "v1.0.3";
+  public static final int VERSION_CODE = 17;
+  public static final String VERSION_NAME = "v1.0.7";
 }

pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="13"
-    android:versionName="v1.0.3" >
+    android:versionCode="17"
+    android:versionName="v1.0.7" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":13,"versionName":"v1.0.3","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug","dirName":""},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":17,"versionName":"v1.0.7","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug","dirName":""},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

pda_libs/pulltoreflashlibrary/build/intermediates/library_manifest/debug/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="13"
-    android:versionName="v1.0.3" >
+    android:versionCode="17"
+    android:versionName="v1.0.7" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -1,8 +1,8 @@
 1<?xml version="1.0" encoding="utf-8"?>
 2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 3    package="com.handmark.pulltorefresh.library"
-4    android:versionCode="13"
-5    android:versionName="v1.0.3" >
+4    android:versionCode="17"
+5    android:versionName="v1.0.7" >
 6
 7    <uses-sdk
 8        android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/merged_manifests/debug/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":13,"versionName":"v1.0.3","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug","dirName":""},"path":"../../library_manifest/debug/AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":17,"versionName":"v1.0.7","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug","dirName":""},"path":"../../library_manifest/debug/AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]