理货优化

app/src/main/java/com/fxy/hk/HkOutboundMainActivity.java

@@ -42,6 +42,8 @@ import com.fxy.bean.ScanBean;
 import com.fxy.common.CommonDialog;
 import com.fxy.constant.BaseConfig;
 import com.fxy.constant.EventCode;
+import com.fxy.hk.bean.InboundBean;
+import com.fxy.hk.bean.OutboundBean;
 import com.fxy.net.MyDialogCallback;
 import com.fxy.net.Urls;
 import com.fxy.view.FloatingImageView;
@@ -77,6 +79,7 @@ public class HkOutboundMainActivity extends  BaseActivity implements StoJNI.Scan
     @BindView(R.id.et_container_code)
     EditText etContainerCode;
 
+
     //托盘组件
     @BindView(R.id.ll_container)
     LinearLayout llContainer;
@@ -89,6 +92,11 @@ public class HkOutboundMainActivity extends  BaseActivity implements StoJNI.Scan
     @BindView(R.id.iv_drag)
     FloatingImageView iv_drag;
 
+    @BindView(R.id.tv_has_scan)
+    TextView tvHasScan;
+
+    @BindView(R.id.tv_no_scan)
+    TextView tvNoScan;
 
 
     //扫码扫码动作
@@ -374,6 +382,7 @@ public class HkOutboundMainActivity extends  BaseActivity implements StoJNI.Scan
                             if(bean.code == 1){
                                 etOrderNo.setEnabled(false);
                                 ibOrderNoClear.setVisibility(View.GONE);
+                                setPageViewData(bean.data);
                                 etContainerCode.setEnabled(true);
                                 etContainerCode.requestFocus();
                             }else{
@@ -388,6 +397,11 @@ public class HkOutboundMainActivity extends  BaseActivity implements StoJNI.Scan
         }
     }
 
+    private void setPageViewData(String data){
+        OutboundBean outboundBean = JsonUtil.getObject(data, OutboundBean.class);
+        tvHasScan.setText(String.valueOf(outboundBean.getHasScan()));
+        tvNoScan.setText(String.valueOf(outboundBean.getNoScan()));
+    }
     /**
      * 关闭托盘
      */
@@ -463,6 +477,7 @@ public class HkOutboundMainActivity extends  BaseActivity implements StoJNI.Scan
                                 ActionBean bean = JsonUtil.getObject(response.body(), ActionBean.class);
                                 if(bean.code == 1){
                                     showSuccessToast(bean.msg);
+                                    setPageViewData(bean.data);
                                     clearData();
                                 }else{
                                     showWarningToast(bean.msg);
@@ -510,6 +525,10 @@ public class HkOutboundMainActivity extends  BaseActivity implements StoJNI.Scan
 
         etContainerCode.setText("");
         etOrderNo.setText("");
+
+        tvHasScan.setText("0");
+        tvNoScan.setText("0");
+
         etContainerCode.setEnabled(false);
         etOrderNo.setEnabled(true);
         setEditTextNormal(etContainerCode,true);

app/src/main/java/com/fxy/hk/HkTrayMainActivity.java

@@ -95,6 +95,8 @@ public class HkTrayMainActivity extends BaseActivity implements StoJNI.ScanCallB
     EditText etCtnCode;
 
 
+    @BindView(R.id.tv_ctn_qty)
+    TextView tvCtnQty;
 
     @BindView(R.id.recyclerview)
     RecyclerView recyclerView;
@@ -201,7 +203,7 @@ public class HkTrayMainActivity extends BaseActivity implements StoJNI.ScanCallB
     @Override
     protected void initView() {
         unbinder = ButterKnife.bind(this);
-        setTitleName("托盘入库");
+        setTitleName("入库扫描");
 
         initAdapter();
         initData();
@@ -441,6 +443,9 @@ public class HkTrayMainActivity extends BaseActivity implements StoJNI.ScanCallB
                             if (bean.code == 1) {
                                 showSuccessToast(bean.msg);
 
+                                InboundBean inboundBean = JsonUtil.getObject(bean.data, InboundBean.class);
+                                tvCtnQty.setText(inboundBean.getCtnQty());
+
                                 etContainerCode.setEnabled(false);
                                 ibContainerCodeClear.setVisibility(View.GONE);
                                 etCtnCode.setEnabled(true);
@@ -554,6 +559,10 @@ public class HkTrayMainActivity extends BaseActivity implements StoJNI.ScanCallB
                                 mAdapter.notifyDataSetChanged();
                                 etCtnCode.setText("");
                                 setEditTextNormal(etCtnCode,true);
+
+
+                                tvCtnQty.setText(inboundBean.getCtnQty());
+
                             } else {
                                 showWarningToast(bean.msg);
                             }
@@ -641,6 +650,7 @@ public class HkTrayMainActivity extends BaseActivity implements StoJNI.ScanCallB
     private void clearData() {
         etContainerCode.setText("");
         etCtnCode.setText("");
+        tvCtnQty.setText("0");
         etContainerCode.setEnabled(true);
         etCtnCode.setEnabled(false);
         tallyDataList.clear();

app/src/main/java/com/fxy/hk/bean/InboundBean.java

@@ -6,22 +6,18 @@ import android.os.Parcelable;
 public class InboundBean implements Parcelable {
     public String pallet_code = "";
     public String ctn_code = "";
+    public String ctn_qty = "";
 
     public String getPalletCode() {
         return pallet_code;
     }
 
-    public InboundBean setPalletCode(String pallet_code) {
-        this.pallet_code = pallet_code;
-        return this;
-    }
 
     public String getCtnCode() {
         return ctn_code;
     }
 
-    public InboundBean setCtnCode(String ctn_code) {
-        this.ctn_code = ctn_code;
+    public InboundBean setCtnCode() {
         return this;
     }
 
@@ -30,9 +26,13 @@ public class InboundBean implements Parcelable {
         return "InboundBean{" +
                 "pallet_code='" + pallet_code + '\'' +
                 ", ctn_code='" + ctn_code + '\'' +
+                ", ctn_qty='" + ctn_qty + '\'' +
                 '}';
     }
 
+    public String getCtnQty() {
+        return ctn_qty;
+    }
 
     @Override
     public int describeContents() {
@@ -43,11 +43,13 @@ public class InboundBean implements Parcelable {
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(this.pallet_code);
         dest.writeString(this.ctn_code);
+        dest.writeString(this.ctn_qty);
     }
 
     public void readFromParcel(Parcel source) {
         this.pallet_code = source.readString();
         this.ctn_code = source.readString();
+        this.ctn_qty = source.readString();
     }
 
     public InboundBean() {
@@ -56,6 +58,7 @@ public class InboundBean implements Parcelable {
     protected InboundBean(Parcel in) {
         this.pallet_code = in.readString();
         this.ctn_code = in.readString();
+        this.ctn_qty = in.readString();
     }
 
     public static final Creator<InboundBean> CREATOR = new Creator<InboundBean>() {

app/src/main/java/com/fxy/hk/bean/OutboundBean.java

@@ -4,42 +4,68 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 public class OutboundBean implements Parcelable {
-    public String order = "";
+    public int no_scan = 0;
+    public int has_scan = 0;
+    public int finish = 0;
 
-    public String getOrder() {
-        return order;
+    public OutboundBean() {
     }
 
-    public OutboundBean setOrder(String order) {
-        this.order = order;
-        return this;
+    public int getNoScan() {
+        return no_scan;
     }
 
-    @Override
-    public int describeContents() {
-        return 0;
+    public void setNoScan(int no_scan) {
+        this.no_scan = no_scan;
     }
 
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(this.order);
+    public int getHasScan() {
+        return has_scan;
     }
 
-    public void readFromParcel(Parcel source) {
-        this.order = source.readString();
+    public void setHasScan(int has_scan) {
+        this.has_scan = has_scan;
     }
 
-    public OutboundBean() {
+    public int getFinish() {
+        return finish;
+    }
+
+    public void setFinish(int finish) {
+        this.finish = finish;
     }
 
     protected OutboundBean(Parcel in) {
-        this.order = in.readString();
+        no_scan = in.readInt();
+        has_scan = in.readInt();
+        finish = in.readInt();
+    }
+
+    @Override
+    public String toString() {
+        return "OutboundBean{" +
+                "no_scan=" + no_scan +
+                ", has_scan=" + has_scan +
+                ", finish=" + finish +
+                '}';
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(no_scan);
+        dest.writeInt(has_scan);
+        dest.writeInt(finish);
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
     }
 
     public static final Creator<OutboundBean> CREATOR = new Creator<OutboundBean>() {
         @Override
-        public OutboundBean createFromParcel(Parcel source) {
-            return new OutboundBean(source);
+        public OutboundBean createFromParcel(Parcel in) {
+            return new OutboundBean(in);
         }
 
         @Override

app/src/main/java/com/fxy/putIn/TallyMainActivity.java

@@ -150,6 +150,9 @@ public class TallyMainActivity extends  BaseActivity implements StoJNI.ScanCallB
     @BindView(R.id.ll_pictures_box)
     LinearLayout llPicturesBox;
 
+    @BindView(R.id.tv_ctn_qty)
+    TextView tvCtnQty;
+
 
     private View notDataView;   //没有数据显示页
     private View errorView;     //错误显示页
@@ -907,6 +910,7 @@ public class TallyMainActivity extends  BaseActivity implements StoJNI.ScanCallB
             String send_way = "";
             String putin_qty = "";
             String pallet_type = "";
+            String ctn_qty = "";
             if (jsonObject.has("list")){
                 String listStr = jsonObject.getString("list");
                 tallyDataList.clear();
@@ -926,6 +930,9 @@ public class TallyMainActivity extends  BaseActivity implements StoJNI.ScanCallB
             if (jsonObject.has("qty")){
                 putin_qty = String.valueOf(jsonObject.getInt("qty"));
             }
+            if (jsonObject.has("ctn_qty")){
+                ctn_qty = String.valueOf(jsonObject.getInt("ctn_qty"));
+            }
 
             if (jsonObject.has("pallet_type")){
                 pallet_type = jsonObject.getString("pallet_type");
@@ -933,6 +940,7 @@ public class TallyMainActivity extends  BaseActivity implements StoJNI.ScanCallB
             mtSendWay.setText(send_way);
             mtPalletType.setText(pallet_type);
             mtPutinQty.setText(putin_qty);
+            tvCtnQty.setText(ctn_qty);
 
             if (jsonObject.has("hold_remark") && !jsonObject.getString("hold_remark").isEmpty()){
                 mtHoldRemark.setText(jsonObject.getString("hold_remark"));
@@ -966,6 +974,7 @@ public class TallyMainActivity extends  BaseActivity implements StoJNI.ScanCallB
             mtPutinQty.setText("");
             mtHoldRemark.setText("");
             etContainerCode.setText("");
+            tvCtnQty.setText("");
             etContainerCode.requestFocus();
         }else{
             etOrderNo.requestFocus();

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

@@ -53,6 +53,87 @@
 
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/md_grey_100" />
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:layout_marginTop="@dimen/dp_10"
+                android:background="@drawable/bg_white_et"
+                android:gravity="center_vertical"
+                android:orientation="vertical"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginBottom="@dimen/dp_10"
+
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1">
+                    <TextView
+                        style="@style/tvLeftStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="已操作">
+                    </TextView>
+                    <TextView
+                        style="@style/tvLeftStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="：">
+                    </TextView>
+                    <TextView
+                        android:id="@+id/tv_has_scan"
+                        style="@style/tvLeftStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="0">
+
+                    </TextView>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1">
+                    <TextView
+                        style="@style/tvLeftStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="待操作">
+                    </TextView>
+                    <TextView
+                        style="@style/tvLeftStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="：">
+                    </TextView>
+                    <TextView
+                        android:id="@+id/tv_no_scan"
+                        style="@style/tvLeftStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="0">
+
+                    </TextView>
+                </LinearLayout>
+
+
+
+            </LinearLayout>
+
+        </LinearLayout>
 
         <View
             android:layout_width="match_parent"

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

@@ -70,7 +70,27 @@
                     style="@style/tvLeftStyle"
                     android:text="最近扫描：" />
 
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:singleLine="true"
+                    android:gravity="right"
+                    android:textSize="@dimen/t24"
+                    android:textColor="@color/actionsheet_red"
+                    android:text="箱数："
+                    tools:ignore="RtlHardcoded">
 
+                </TextView>
+                <TextView
+                    android:id="@+id/tv_ctn_qty"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="@dimen/t24"
+                    android:layout_marginRight="10dp"
+                    android:textColor="@color/actionsheet_red"
+                    android:text="0">
+                </TextView>
             </LinearLayout>
 
             <LinearLayout

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

@@ -269,16 +269,42 @@
                 android:background="@color/md_grey_100" />
 
             <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/LinearLayoutLoginStyle"
+
+
+
                 android:paddingBottom="5dp"
                 android:paddingTop="5dp"
                 android:orientation="horizontal">
                 <TextView
                     android:layout_marginLeft="@dimen/dp_10"
                     style="@style/tvLeftStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:text="最近扫描：" />
 
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:singleLine="true"
+                    android:gravity="right"
+                    android:textSize="@dimen/t24"
+                    android:textColor="@color/actionsheet_red"
+                    android:text="箱数："
+                    tools:ignore="RtlHardcoded">
+
+                </TextView>
+                <TextView
+                    android:id="@+id/tv_ctn_qty"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="@dimen/t24"
+                    android:layout_marginRight="10dp"
+                    android:textColor="@color/actionsheet_red"
+                    android:text="0">
+
+                </TextView>
 
             </LinearLayout>
 

config.gradle

@@ -8,7 +8,7 @@ ext {
             minSdkVersion    : 17,
             targetSdkVersion : 23,
             versionCode      : 1,
-            versionName      : "2.7.2",
+            versionName      : "2.7.3",
             versionApi       : "2.7",
             versionRealm     : 2,
     ]