修改 原材料出入退

app/src/main/java/com/example/jingyuan_mes/entity/store/InventoryWorkBeen.java

@@ -37,6 +37,34 @@ public class InventoryWorkBeen extends BaseObservable {
     private int inventoryTime;
     private String materialCode;
     private String materialName;
+    private String materialSpec;
+    private String saleorderCode;//销售订单
+    private String poNo;//采购订单 stockType==1
+
+
+    public String getMaterialSpec() {
+        return materialSpec;
+    }
+
+    public void setMaterialSpec(String materialSpec) {
+        this.materialSpec = materialSpec;
+    }
+
+    public String getSaleorderCode() {
+        return saleorderCode;
+    }
+
+    public void setSaleorderCode(String saleorderCode) {
+        this.saleorderCode = saleorderCode;
+    }
+
+    public String getPoNo() {
+        return poNo;
+    }
+
+    public void setPoNo(String poNo) {
+        this.poNo = poNo;
+    }
 
     public int getInventoryCheckDetailId() {
         return inventoryCheckDetailId;

app/src/main/java/com/example/jingyuan_mes/entity/store/RelocationInfoSubmit.java

@@ -18,7 +18,7 @@ public class RelocationInfoSubmit extends BaseObservable {
 
     private String materialBarcode;
     private String locationCode;
-    private int applyQty;
+    private String applyQty;
     private String taskCode;
     private String moveType;
 
@@ -38,11 +38,11 @@ public class RelocationInfoSubmit extends BaseObservable {
         this.locationCode = locationCode;
     }
 
-    public int getApplyQty() {
+    public String getApplyQty() {
         return applyQty;
     }
 
-    public void setApplyQty(int applyQty) {
+    public void setApplyQty(String applyQty) {
         this.applyQty = applyQty;
     }
 
@@ -65,7 +65,7 @@ public class RelocationInfoSubmit extends BaseObservable {
     public void clearView() {
         materialBarcode = null;
         locationCode = null;
-        applyQty = 0;
+        applyQty = "0";
         notifyChange();
     }
 

app/src/main/java/com/example/jingyuan_mes/store/ProductOutInfoActivity.java

@@ -4,6 +4,8 @@ import androidx.databinding.DataBindingUtil;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.View;
 import android.widget.Toast;
 
@@ -36,6 +38,26 @@ public class ProductOutInfoActivity extends BaseActivity {
         binding.setSub(submit);
         adapter=new ProductOutInfoAdapter(this);
         binding.setAdapter(adapter);
+        binding.productOutInfoLocation.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (start == 0 && count > 10) {
+                    binding.productOutInfoLocation.clearFocus();
+                    binding.productOutInfoGoods.requestFocus();
+                }
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
         initRequest(id);
 
     }

app/src/main/java/com/example/jingyuan_mes/store/RelocationApplyActivity.java

@@ -46,6 +46,7 @@ public class RelocationApplyActivity extends BaseActivity {
                         var body = response.body();
                         if (body.getCode()==200){
                            relocationApplyBeen.clear();
+                           finish();
                         }
                         Toast.makeText(context, body.getMsg(), Toast.LENGTH_SHORT).show();
                     }

app/src/main/java/com/example/jingyuan_mes/store/SemiActivity.java

@@ -4,6 +4,8 @@ import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableField;
 
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.widget.Toast;
 
 import com.example.jingyuan_mes.R;
@@ -38,8 +40,27 @@ public class SemiActivity extends BaseActivity {
         locationCode=new ObservableField<>();
         proCode=new ObservableField<>();
         binding.setVm(this);
+        binding.semiLocation.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (start == 0 && count > 10) {
+                    binding.semiLocation.clearFocus();
+                    binding.semiGoods.requestFocus();
+                }
 
-        initRequest();
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
+    initRequest();
     }
 
     private void initRequest() {

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

@@ -139,6 +139,7 @@
                 android:text="扫描库位:" />
 
             <EditText
+                android:id="@+id/product_out_info_location"
                 style="@style/text_san"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -159,6 +160,7 @@
                 android:text="扫描成品:" />
 
             <EditText
+                android:id="@+id/product_out_info_goods"
                 style="@style/text_san"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

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

@@ -86,7 +86,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:gravity="center"
-                android:text='@={vm.applyQty+""}' />
+                android:inputType="numberDecimal"
+                android:text='@={vm.applyQty}' />
         </LinearLayout>
 
         <LinearLayout

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

@@ -47,6 +47,7 @@
                 android:text="扫描库位:" />
 
             <EditText
+                android:id="@+id/semi_location"
                 style="@style/text_san"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -67,6 +68,7 @@
 
             <!--          -->
             <EditText
+                android:id="@+id/semi_goods"
                 style="@style/text_san"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

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

@@ -25,19 +25,31 @@
 
             <TextView
                 style="@style/item_title_left"
-                android:layout_width="110dp"
+                android:layout_width="60dp"
                 android:layout_height="match_parent"
-                android:text="物料编号:" />
+                android:text="物料批次:" />
 
             <TextView
-                style="@style/text_info"
+                style="@style/item_info"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text='@{vm.materialBatch}' />
 
-                android:text='@{vm.materialCode}' />
+            <TextView
+                style="@style/item_title_left"
+                android:layout_width="60dp"
+                android:layout_height="match_parent"
 
-        </LinearLayout>
+                android:text="物料编号:" />
 
+            <TextView
+                style="@style/item_info"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text='@{vm.materialCode}' />
+        </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -45,16 +57,31 @@
 
             <TextView
                 style="@style/item_title_left"
-                android:layout_width="110dp"
+                android:layout_width="60dp"
                 android:layout_height="match_parent"
                 android:text="物料名称:" />
 
             <TextView
-                style="@style/text_info"
+                style="@style/item_info"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_weight="1"
                 android:text="@{vm.materialName}" />
 
+            <TextView
+                style="@style/item_title_left"
+                android:layout_width="60dp"
+                android:layout_height="match_parent"
+
+                android:text="物料规格:" />
+
+            <TextView
+                style="@style/item_info"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text='@{vm.materialSpec}' />
+
         </LinearLayout>
 
 
@@ -64,15 +91,28 @@
 
             <TextView
                 style="@style/item_title_left"
-                android:layout_width="110dp"
+                android:layout_width="60dp"
                 android:layout_height="match_parent"
-                android:text="库位:" />
+                android:text='@{vm.stockType.equals("1")?"采购订单:":"销售订单:"}'/>
 
             <TextView
-                style="@style/text_info"
+                style="@style/item_info"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text='@{vm.stockType.equals("1")?vm.poNo:vm.saleorderCode}' />
+
+            <TextView
+                style="@style/item_title_left"
+                android:layout_width="60dp"
+                android:layout_height="match_parent"
+                android:text="库位:" />
 
+            <TextView
+                style="@style/item_info"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
                 android:text='@{vm.locationCode}' />
 
         </LinearLayout>
@@ -89,7 +129,7 @@
                 android:text="库存数量:" />
 
             <TextView
-                style="@style/text_info"
+                style="@style/item_info"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:text='@{vm.stockAmount+""}' />
@@ -107,7 +147,7 @@
                 android:text="盘点次数:" />
 
             <TextView
-                style="@style/text_info"
+                style="@style/item_info"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
 
@@ -132,14 +172,14 @@
                 android:layout_weight="1"
                 android:enabled='@{!vm.checkStatus.equals("2")}'
                 android:text='@={vm.realAmount+""}' />
+
             <Button
                 android:id="@+id/inventory_work_confirm"
                 android:layout_width="90dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="8dp"
-                android:visibility='@{vm.checkStatus.equals("2")?View.GONE:View.VISIBLE}'
                 android:text="确认"
-                />
+                android:visibility='@{vm.checkStatus.equals("2")?View.GONE:View.VISIBLE}' />
         </LinearLayout>