修改领用转移界面提交按钮传参问题，增加领用转移列表

app/src/main/java/com/uas/equipment/bean/StoragerechargeTwoBean.java

@@ -0,0 +1,92 @@
+package com.uas.equipment.bean;
+
+/**
+ * Created by jsxiaoshui on 2022-10-09
+ */
+public class StoragerechargeTwoBean {
+    private String VA_CODE;
+    private String VA_ID;
+    private String VA_CLASS;
+    private String VA_STATUS;
+    private String VA_VENDNAME;
+    private String VA_VENDCODE;
+    private String VA_SENDCODE;
+    private String RN;
+    public StoragerechargeTwoBean(){
+
+    }
+    public StoragerechargeTwoBean(String VA_CODE, String VA_ID, String VA_CLASS, String VA_STATUS, String VA_VENDNAME, String VA_VENDCODE, String VA_SENDCODE, String RN) {
+        this.VA_CODE = VA_CODE;
+        this.VA_ID = VA_ID;
+        this.VA_CLASS = VA_CLASS;
+        this.VA_STATUS = VA_STATUS;
+        this.VA_VENDNAME = VA_VENDNAME;
+        this.VA_VENDCODE = VA_VENDCODE;
+        this.VA_SENDCODE = VA_SENDCODE;
+        this.RN = RN;
+    }
+
+    public String getVA_CODE() {
+        return VA_CODE;
+    }
+
+    public void setVA_CODE(String VA_CODE) {
+        this.VA_CODE = VA_CODE;
+    }
+
+    public String getVA_ID() {
+        return VA_ID;
+    }
+
+    public void setVA_ID(String VA_ID) {
+        this.VA_ID = VA_ID;
+    }
+
+    public String getVA_CLASS() {
+        return VA_CLASS;
+    }
+
+    public void setVA_CLASS(String VA_CLASS) {
+        this.VA_CLASS = VA_CLASS;
+    }
+
+    public String getVA_STATUS() {
+        return VA_STATUS;
+    }
+
+    public void setVA_STATUS(String VA_STATUS) {
+        this.VA_STATUS = VA_STATUS;
+    }
+
+    public String getVA_VENDNAME() {
+        return VA_VENDNAME;
+    }
+
+    public void setVA_VENDNAME(String VA_VENDNAME) {
+        this.VA_VENDNAME = VA_VENDNAME;
+    }
+
+    public String getVA_VENDCODE() {
+        return VA_VENDCODE;
+    }
+
+    public void setVA_VENDCODE(String VA_VENDCODE) {
+        this.VA_VENDCODE = VA_VENDCODE;
+    }
+
+    public String getVA_SENDCODE() {
+        return VA_SENDCODE;
+    }
+
+    public void setVA_SENDCODE(String VA_SENDCODE) {
+        this.VA_SENDCODE = VA_SENDCODE;
+    }
+
+    public String getRN() {
+        return RN;
+    }
+
+    public void setRN(String RN) {
+        this.RN = RN;
+    }
+}

app/src/main/java/com/uas/equipment/fragment/MaintenanceManagementListFragment.java

@@ -47,7 +47,7 @@ import com.uas.equipment.util.HttpCallback;
 import com.uas.equipment.util.HttpParams;
 import com.uas.equipment.util.VolleyRequest;
 import com.uas.equipment.view.ClearableEditText;
-import com.uuzuche.lib_zxing.activity.CaptureActivity;
+import com.uas.equipment.camera.CaptureActivity;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
 import org.greenrobot.eventbus.EventBus;

app/src/main/java/com/uas/equipment/fragment/RequisitionTransferFragment.java

@@ -297,7 +297,7 @@ public class RequisitionTransferFragment extends BaseFragment{
                 String de_currentcentername = FastjsonUtil.getText(dataObject, "DE_CURRENTCENTERNAME");
                 String de_workshop = FastjsonUtil.getText(dataObject, "DE_WORKSHOP");
                 String de_currentlinecode = FastjsonUtil.getText(dataObject, "DE_CURRENTLINECODE");
-                de_code = FastjsonUtil.getText(dataObject, "DE_BACODE");
+                de_code = FastjsonUtil.getText(dataObject, "DE_CODE");
                 tv_de_code.setText(de_code);
 
 
@@ -355,11 +355,11 @@ public class RequisitionTransferFragment extends BaseFragment{
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.GREEN);
                 tv_prompt.setText("领用成功");
-//                String result = o.toString();
-//                JSONObject resultObject = JSON.parseObject(result);
-//                JSONObject dataObject = resultObject.getJSONObject("items");
-//                String dc_code = FastjsonUtil.getText(dataObject, "dc_code");
-//                tv_apply_forcode.setText(dc_code);
+                String result = o.toString();
+                JSONObject resultObject = JSON.parseObject(result);
+                JSONObject dataObject = resultObject.getJSONObject("items");
+                dc_code = FastjsonUtil.getText(dataObject, "dc_code");
+                tv_apply_forcode.setText(dc_code);
                 getNewNameData();
                 EventBus.getDefault().post(new MessageOutboundEvents("提交单据后刷新列表"));
 
@@ -588,12 +588,16 @@ public class RequisitionTransferFragment extends BaseFragment{
                 String dc_reason = FastjsonUtil.getText(dataObject, "dc_reason");
                 String dc_status = FastjsonUtil.getText(dataObject, "dc_status");
                 String dc_code = FastjsonUtil.getText(dataObject, "dc_code");
+                dc_id = FastjsonUtil.getText(dataObject, "dc_id");
                 if (!StringUtil.isEmpty(dc_status)){
                     if (dc_status.equals("在录入")){
                         btn_audit.setEnabled(false);
+                        btn_receive.setEnabled(true);
+                        btn_commit.setEnabled(true);
                     }else if (dc_status.equals("已提交")){
                         btn_receive.setEnabled(false);
                         btn_commit.setEnabled(false);
+                        btn_audit.setEnabled(true);
                     }else if (dc_status.equals("已审核")){
                         btn_receive.setEnabled(false);
                         btn_commit.setEnabled(false);

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

@@ -29,7 +29,7 @@
                 android:background="@null"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
-                android:hint="请采集设备编号"
+                android:hint="请输入设备编号"
                 android:imeOptions="actionSend"
                 android:textColor="@color/black" />
 

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

@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/white">
+    <CheckBox
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_10"
+        android:id="@+id/add_checkbos"
+        android:text="取消采集"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+    </CheckBox>
+    <LinearLayout
+        android:padding="@dimen/sp_16"
+        android:paddingLeft="@dimen/sp_16"
+        android:paddingRight="@dimen/sp_16"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_line_edittext">
+
+<!--            <com.uas.uas_mes_zb_p.view.ClearableEditText-->
+<!--                android:id="@+id/storage_recharge_collect_ets"-->
+<!--                style="@style/EditTextStyle"-->
+<!--                android:layout_weight="1"-->
+<!--                android:background="@null"-->
+<!--                android:focusable="true"-->
+<!--                android:lines="1"-->
+<!--                android:focusableInTouchMode="true"-->
+<!--                android:hint="请采集单号"-->
+<!--                android:imeOptions="actionSend"-->
+<!--                android:textColor="@color/black" />-->
+            <com.uas.equipment.view.ClearableEditText
+                android:id="@+id/storage_recharge_collect_ets"
+                style="@style/EditTextStyle"
+                android:layout_weight="1"
+                android:background="@null"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请采集条码"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black" />
+
+            <ImageView
+                android:id="@+id/storage_recharge_scan_ivs"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginRight="10dp"
+                android:clickable="false"
+                android:src="@drawable/ic_edittext_scan" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+    <ScrollView
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@color/white"
+        android:padding="@dimen/textsize_16">
+
+
+        <LinearLayout
+            android:background="@color/white"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:minWidth="60dp"
+                android:text="单据编号      "
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/tv_documents_code"
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:minWidth="60dp"
+                android:text=""
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:background="@color/white"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:minWidth="60dp"
+                android:text="供应商编号"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+
+            <EditText
+                android:id="@+id/tv_supplier_code"
+                style="@style/EditTextStyle"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:background="@drawable/bg_line_edittext"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="30dp"
+                android:lines="1"
+                android:editable="false">
+            </EditText>
+
+        </LinearLayout>
+        <LinearLayout
+            android:background="@color/white"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:minWidth="60dp"
+                android:text="供应商名称"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+
+            <EditText
+                android:id="@+id/tv_supplier_name"
+                style="@style/EditTextStyle"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:background="@drawable/bg_line_edittext"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="30dp"
+                android:lines="1"
+                android:editable="false">
+            </EditText>
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:background="@color/white"
+            android:id="@+id/jlt_storage_in_barcode_line"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:minWidth="60dp"
+                android:text="送货单号"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+
+            <com.uas.equipment.view.ClearableEditText
+                android:id="@+id/tv_delivery_code"
+                style="@style/EditTextStyle"
+                android:layout_marginLeft="18dp"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:lines="1"
+                android:layout_height="30dp"
+                android:background="@drawable/bg_line_edittext"
+                android:hint="请输入送货单号" />
+        </LinearLayout>
+        <com.bin.david.form.core.SmartTable
+            android:layout_marginTop="@dimen/textsize_20"
+            android:id="@+id/jlt_storage_in_filter_list_sts"
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            android:layout_marginBottom="@dimen/dp_10"/>
+
+    </LinearLayout>
+    </ScrollView>
+    <LinearLayout
+        android:background="@color/white"
+        android:paddingLeft="@dimen/sp_16"
+        android:paddingRight="@dimen/sp_16"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <Button
+            android:id="@+id/jlt_storage_in_generate_detailed_btn"
+            style="@style/ButtonStyle"
+            android:layout_width="0dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:text="生成明细"
+            android:enabled="false"
+            />
+        <Button
+            android:id="@+id/jlt_storage_in_barcode_save_btn"
+            style="@style/ButtonStyle"
+            android:layout_width="0dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:text="提交"
+            android:enabled="false"
+            />
+        <Button
+            android:id="@+id/jlt_storage_in_audit_btn"
+            style="@style/ButtonStyle"
+            android:layout_width="0dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:text="审核"
+            android:enabled="false"
+            />
+
+    </LinearLayout>
+</LinearLayout>

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

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/textsize_16"
+        android:background="@drawable/bg_line_edittext">
+
+        <com.uas.equipment.view.ClearableEditText
+            android:id="@+id/storage_recharge_collect_et"
+            style="@style/EditTextStyle"
+            android:layout_weight="1"
+            android:background="@null"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:hint="请采集单号"
+            android:imeOptions="actionSend"
+            android:textColor="@color/black" />
+
+        <ImageView
+            android:id="@+id/storage_recharge_scan_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginRight="10dp"
+            android:clickable="false"
+            android:src="@drawable/ic_edittext_scan" />
+    </LinearLayout>
+    <com.scwang.smartrefresh.layout.SmartRefreshLayout
+        android:id="@+id/pda_wms_in_filter_list_srl"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <com.scwang.smartrefresh.layout.header.ClassicsHeader
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <com.bin.david.form.core.SmartTable
+            android:id="@+id/jlt_storage_in_filter_list_st"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <com.scwang.smartrefresh.layout.footer.ClassicsFooter
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:srlAccentColor="@android:color/darker_gray" />
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+</LinearLayout>

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

@@ -366,6 +366,8 @@
     <string name="please_input_printer_resolution">请输入打印机分辨率</string>
     <string name="prompt_set_default_warehouse">设置默认仓库，如果默认仓库有设置值，则PDA中需要手动输入仓库编号的输入框都会自动读取该默认仓库编号
     </string>
+    <string name="title_storage_rechargetwo">收料单列表</string>
+    <string name="title_storage_rechargeadd">新增收料单</string>
     <string name="string_default_warehouse">默认仓库编号</string>
     <string name="string_default_linecode">默认线别</string>
     <string name="default_warehouse">仓库编号</string>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Wed Mar 08 11:15:34 CST 2023
+#Fri Mar 10 17:11:22 CST 2023
 D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
 D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
 D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml