吉利通第n次反馈

app/src/main/java/com/uas/jlt_storage/adapter/JLTUpperShelfBoxAdapter.java

@@ -24,10 +24,15 @@ public class JLTUpperShelfBoxAdapter extends BaseQuickAdapter<BoxBean, BaseViewH
 
     @Override
     protected void convert(BaseViewHolder helper, BoxBean item) {
-        if (item.isUpperFailed()) {
+        if (item.getUpperStatus() == BoxBean.UPPER_STATUS_ERROR) {
             helper.setTextColor(R.id.item_jlt_upper_shelf_box_box_tv, mContext.getResources().getColor(R.color.red));
+            helper.setTextColor(R.id.item_jlt_upper_shelf_box_error_tv, mContext.getResources().getColor(R.color.red));
+        } else if (item.getUpperStatus() == BoxBean.UPPER_STATUS_WARN) {
+            helper.setTextColor(R.id.item_jlt_upper_shelf_box_box_tv, mContext.getResources().getColor(R.color.orange));
+            helper.setTextColor(R.id.item_jlt_upper_shelf_box_error_tv, mContext.getResources().getColor(R.color.orange));
         } else {
             helper.setTextColor(R.id.item_jlt_upper_shelf_box_box_tv, mContext.getResources().getColor(R.color.value_text_color));
+            helper.setTextColor(R.id.item_jlt_upper_shelf_box_error_tv, mContext.getResources().getColor(R.color.value_text_color));
         }
         helper.setText(R.id.item_jlt_upper_shelf_box_box_tv, item.getBoxCode());
         helper.setOnClickListener(R.id.item_jlt_upper_shelf_box_delete_iv, new View.OnClickListener() {
@@ -39,7 +44,7 @@ public class JLTUpperShelfBoxAdapter extends BaseQuickAdapter<BoxBean, BaseViewH
             }
         });
 
-        helper.setGone(R.id.item_jlt_upper_shelf_box_error_tv, item.isUpperFailed() && !TextUtils.isEmpty(item.getFailStr()));
+        helper.setGone(R.id.item_jlt_upper_shelf_box_error_tv, (item.getUpperStatus() != BoxBean.UPPER_STATUS_NORMAL) && !TextUtils.isEmpty(item.getFailStr()));
         helper.setText(R.id.item_jlt_upper_shelf_box_error_tv, item.getFailStr());
     }
 

app/src/main/java/com/uas/jlt_storage/bean/BoxBean.java

@@ -3,9 +3,13 @@ package com.uas.jlt_storage.bean;
 import com.alibaba.fastjson.annotation.JSONField;
 
 public class BoxBean {
+    public static final int UPPER_STATUS_NORMAL = 11;
+    public static final int UPPER_STATUS_ERROR = 22;
+    public static final int UPPER_STATUS_WARN = 33;
+
     @JSONField(name = "BoxCode")
     private String BoxCode;
-    private boolean upperFailed;
+    private int upperStatus;
     private String failStr;
 
     public String getBoxCode() {
@@ -16,12 +20,12 @@ public class BoxBean {
         BoxCode = boxCode;
     }
 
-    public boolean isUpperFailed() {
-        return upperFailed;
+    public int getUpperStatus() {
+        return upperStatus;
     }
 
-    public void setUpperFailed(boolean upperFailed) {
-        this.upperFailed = upperFailed;
+    public void setUpperStatus(int upperStatus) {
+        this.upperStatus = upperStatus;
     }
 
     public String getFailStr() {

app/src/main/java/com/uas/jlt_storage/fragment/JLTPickMaterialOutFragment.java

@@ -79,6 +79,14 @@ public class JLTPickMaterialOutFragment extends BaseFragment implements OnColumn
     private ArrayColumn<Double> mMpqColumn, mQtyColumn, mRemainColumn;
     private ArrayColumn<Long> mPosColumn;
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        SharedPreUtil.removeKey(mActivity, Constants.FLAG.JLT_PICK_MATERIAL_NUM);
+        SharedPreUtil.removeKey(mActivity, Constants.FLAG.JLT_PICK_MATERIAL_CACHE);
+        SharedPreUtil.removeKey(mActivity, Constants.FLAG.JLT_PICK_MATERIAL_ORDER);
+    }
+
     @Override
     protected int getLayout() {
         return R.layout.fragment_jlt_pick_material_out;
@@ -114,12 +122,12 @@ public class JLTPickMaterialOutFragment extends BaseFragment implements OnColumn
                 .setShowYSequence(false)
                 .setShowTableTitle(false)
                 .setFixedTitle(true)
-                .setVerticalPadding(CommonUtil.dip2px(mActivity,12))
-                .setColumnTitleVerticalPadding(CommonUtil.dip2px(mActivity,12))
-                .setHorizontalPadding(CommonUtil.dip2px(mActivity,10))
-                .setSequenceHorizontalPadding(CommonUtil.dip2px(mActivity,10))
-                .setColumnTitleHorizontalPadding(CommonUtil.dip2px(mActivity,10))
-                .setColumnTitleStyle(new FontStyle(CommonUtil.sp2px(mActivity,15), Color.parseColor("#000000")))
+                .setVerticalPadding(CommonUtil.dip2px(mActivity, 12))
+                .setColumnTitleVerticalPadding(CommonUtil.dip2px(mActivity, 12))
+                .setHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setSequenceHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setColumnTitleHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setColumnTitleStyle(new FontStyle(CommonUtil.sp2px(mActivity, 15), Color.parseColor("#000000")))
                 .setContentCellBackgroundFormat(new BaseCellBackgroundFormat<CellInfo>() {
                     @Override
                     public int getBackGroundColor(CellInfo cellInfo) {
@@ -187,6 +195,15 @@ public class JLTPickMaterialOutFragment extends BaseFragment implements OnColumn
             }
         });
 
+        mNumEditText.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNumEditText.clearFocus();
+                mNumEditText.requestFocus();
+                mNumEditText.selectAll();
+            }
+        });
+
         mNumEditText.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -283,6 +300,9 @@ public class JLTPickMaterialOutFragment extends BaseFragment implements OnColumn
         if (TextUtils.isEmpty(inOutNoString)) {
             return;
         }
+        mNumEditText.clearFocus();
+        mNumEditText.requestFocus();
+        mNumEditText.selectAll();
 
         progressDialog.show();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
@@ -429,11 +449,4 @@ public class JLTPickMaterialOutFragment extends BaseFragment implements OnColumn
         return false;
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        SharedPreUtil.removeKey(mActivity, Constants.FLAG.JLT_PICK_MATERIAL_NUM);
-        SharedPreUtil.removeKey(mActivity, Constants.FLAG.JLT_PICK_MATERIAL_CACHE);
-        SharedPreUtil.removeKey(mActivity, Constants.FLAG.JLT_PICK_MATERIAL_ORDER);
-    }
 }

app/src/main/java/com/uas/jlt_storage/fragment/JLTStockInquiryLocationFragment.java

@@ -106,6 +106,15 @@ public class JLTStockInquiryLocationFragment extends BaseFragment {
                 searchByLocation();
             }
         });
+
+        mLocationEditText.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mLocationEditText.clearFocus();
+                mLocationEditText.requestFocus();
+                mLocationEditText.selectAll();
+            }
+        });
     }
 
     @Override
@@ -120,6 +129,9 @@ public class JLTStockInquiryLocationFragment extends BaseFragment {
             CommonUtil.toastNoRepeat(mActivity, "仓位/箱号为必填项");
             return;
         }
+        mLocationEditText.clearFocus();
+        mLocationEditText.requestFocus();
+        mLocationEditText.selectAll();
 
         progressDialog.show();
         mStorageModelBeans.clear();

app/src/main/java/com/uas/jlt_storage/fragment/JLTStockInquiryModelFragment.java

@@ -107,6 +107,15 @@ public class JLTStockInquiryModelFragment extends BaseFragment {
                 searchByModel();
             }
         });
+
+        mModelEditText.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mModelEditText.clearFocus();
+                mModelEditText.requestFocus();
+                mModelEditText.selectAll();
+            }
+        });
     }
 
     @Override
@@ -121,6 +130,9 @@ public class JLTStockInquiryModelFragment extends BaseFragment {
             CommonUtil.toastNoRepeat(mActivity, "型号为必填项");
             return;
         }
+        mModelEditText.clearFocus();
+        mModelEditText.requestFocus();
+        mModelEditText.selectAll();
 
         progressDialog.show();
         mStorageModelBeans.clear();

app/src/main/java/com/uas/jlt_storage/fragment/JLTStorageInBarcodeFragment.java

@@ -422,7 +422,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
     private void selectMpq(double qty, JLTPkgEntity pkgEntity) {
         mBarcodeParseBean.setPRCODE(pkgEntity.getPR_CODE());
         mEnclosureEditText.setText(pkgEntity.getPR_PKG());
-        isMpqDiv = pkgEntity.getPR_FBBZL_USER() == -1;
+        isMpqDiv = pkgEntity.getPR_FBBZL_USER() == 0;
 
         List<JLTMpqEntity> mpqlist = pkgEntity.getMPQLIST();
         List<JLTMpqEntity> requireMpqs = new ArrayList<>();

app/src/main/java/com/uas/jlt_storage/fragment/JLTStorageInBoxScanFragment.java

@@ -129,6 +129,8 @@ public class JLTStorageInBoxScanFragment extends BaseFragment implements View.On
             @Override
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
+                mBoxEditText.setText("");
+                mBoxEditText.requestFocus();
                 CommonUtil.toastNoRepeat(mActivity, failStr);
             }
         });
@@ -241,7 +243,7 @@ public class JLTStorageInBoxScanFragment extends BaseFragment implements View.On
         FragmentManager supportFragmentManager = getActivity().getSupportFragmentManager();
         if (supportFragmentManager != null) {
             supportFragmentManager.popBackStack();
-            if (mOnFinishListener!=null){
+            if (mOnFinishListener != null) {
                 mOnFinishListener.onFinish();
             }
         }

app/src/main/java/com/uas/jlt_storage/fragment/JLTStorageMaterialMoveDetailFragment.java

@@ -80,6 +80,14 @@ public class JLTStorageMaterialMoveDetailFragment extends BaseFragment {
 
     @Override
     protected void initEvents() {
+        CommonUtil.setEditorActionListener(mQuantityEditText, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                mLocationEditText.setFocusable(true);
+                mLocationEditText.requestFocus();
+            }
+        });
+
         CommonUtil.setEditorActionListener(mLocationEditText, new MyEditorActionListener() {
             @Override
             public void MyEditorAction(String text, int actionId, KeyEvent event) {
@@ -128,6 +136,7 @@ public class JLTStorageMaterialMoveDetailFragment extends BaseFragment {
                 if (s.length() == 0) {
                     mBoxEditText.setText("");
                     mBoxEditText.setEnabled(false);
+                    mShelvesCheckBox.setChecked(true);
                 }
             }
         });
@@ -195,6 +204,8 @@ public class JLTStorageMaterialMoveDetailFragment extends BaseFragment {
                 .addParam("mpn", mMaterialBean.getBAR_MPN())
                 .addParam("zxbzs", CommonUtil.doubleFormat(mMaterialBean.getBAR_ZXBZS()))
                 .addParam("whcode", mMaterialBean.getBAR_WHCODE())
+                .addParam("oldBoxCode", mMaterialBean.getBAR_OUTBOXCODE1())
+                .addParam("prodCode", mMaterialBean.getBAR_PRODCODE())
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
@@ -233,7 +244,7 @@ public class JLTStorageMaterialMoveDetailFragment extends BaseFragment {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
-
+                mBoxEditText.requestFocus();
             }
 
             @Override
@@ -264,7 +275,12 @@ public class JLTStorageMaterialMoveDetailFragment extends BaseFragment {
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
                 try {
-                    mBoxEditText.requestFocus();
+                    mBoxEditText.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            mBoxEditText.requestFocus();
+                        }
+                    }, 100);
                     String result = o.toString();
                     JSONObject resultObject = JSON.parseObject(result);
                     JSONObject dataObject = FastjsonUtil.getJSONObject(resultObject, "data");
@@ -363,7 +379,11 @@ public class JLTStorageMaterialMoveDetailFragment extends BaseFragment {
             if (dataObject != null) {
                 JSONArray dataByMPNArray = dataObject.getJSONArray("DataByMPN");
                 double restQty = FastjsonUtil.getDouble(dataObject, "restQty");
-                if (restQty <= 0) {
+                if (restQty != -1) {
+                    mQuantityEditText.setText(
+                            CommonUtil.doubleFormat(restQty));
+                }
+                if (restQty == 0) {
                     CommonUtil.toastNoRepeat(mActivity, "该型号物料移动完成");
                     getActivity().getSupportFragmentManager().popBackStack();
                     return;

app/src/main/java/com/uas/jlt_storage/fragment/JLTStorageMaterialMoveFragment.java

@@ -189,12 +189,14 @@ public class JLTStorageMaterialMoveFragment extends BaseFragment implements OnCo
     }
 
     private void jumpToDetail(int position) {
-        JLTStorageMaterialMoveDetailFragment materialMoveDetailFragment = new JLTStorageMaterialMoveDetailFragment();
+        if (mMaterialBeans.size() > position) {
+            JLTStorageMaterialMoveDetailFragment materialMoveDetailFragment = new JLTStorageMaterialMoveDetailFragment();
 
-        Bundle bundle = new Bundle();
-        bundle.putSerializable("materialBean", mMaterialBeans.get(position));
-        materialMoveDetailFragment.setArguments(bundle);
-        FragmentUtils.switchFragment(JLTStorageMaterialMoveFragment.this, materialMoveDetailFragment);
+            Bundle bundle = new Bundle();
+            bundle.putSerializable("materialBean", mMaterialBeans.get(position));
+            materialMoveDetailFragment.setArguments(bundle);
+            FragmentUtils.switchFragment(JLTStorageMaterialMoveFragment.this, materialMoveDetailFragment);
+        }
     }
 
     @Override

app/src/main/java/com/uas/jlt_storage/fragment/JLTUpperShelfBoxFragment.java

@@ -212,7 +212,7 @@ public class JLTUpperShelfBoxFragment extends BaseFragment implements View.OnCli
         }
         BoxBean boxBean = new BoxBean();
         boxBean.setBoxCode(boxNum);
-        boxBean.setUpperFailed(false);
+        boxBean.setUpperStatus(BoxBean.UPPER_STATUS_NORMAL);
         boxBean.setFailStr("");
         mBoxList.add(0, boxBean);
 
@@ -233,12 +233,12 @@ public class JLTUpperShelfBoxFragment extends BaseFragment implements View.OnCli
                 searchWhcode();
                 break;
             case R.id.jlt_upper_shelf_box_confirm_btn:
-                confirmUpshelf();
+                confirmUpshelf(false);
                 break;
         }
     }
 
-    private void confirmUpshelf() {
+    private void confirmUpshelf(boolean ignoreWarm) {
         String whcode = mWhcodeEditText.getText().toString().trim();
         String location = mLocationEditText.getText().toString().trim();
 
@@ -266,6 +266,7 @@ public class JLTUpperShelfBoxFragment extends BaseFragment implements View.OnCli
                 .addParam("data", boxJson)
 //                .addParam("whcode", whcode)
                 .addParam("location", location)
+                .addParam("ignoreWarm", String.valueOf(ignoreWarm))
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
@@ -281,21 +282,41 @@ public class JLTUpperShelfBoxFragment extends BaseFragment implements View.OnCli
                         mUpperShelfBoxAdapter.notifyDataSetChanged();
                         CommonUtil.toastNoRepeat(mActivity, "上架成功");
                     } else {
+                        int errorCount = 0, warnCount = 0;
                         for (int i = 0; i < mBoxList.size(); i++) {
                             BoxBean boxBean = mBoxList.get(i);
                             for (int j = 0; j < dataArray.size(); j++) {
                                 JSONObject dataObject = dataArray.getJSONObject(j);
                                 String boxcode = FastjsonUtil.getText(dataObject, "boxcode");
-                                String error = FastjsonUtil.getText(dataObject, "error");
                                 if (!TextUtils.isEmpty(boxcode) && boxcode.equals(boxBean.getBoxCode())) {
-                                    boxBean.setUpperFailed(true);
+                                    if (dataObject.containsKey("error")) {
+                                        errorCount++;
+                                        boxBean.setUpperStatus(BoxBean.UPPER_STATUS_ERROR);
+                                    } else if (dataObject.containsKey("warm")) {
+                                        warnCount++;
+                                        boxBean.setUpperStatus(BoxBean.UPPER_STATUS_WARN);
+                                    }
+                                    String error = FastjsonUtil.getText(dataObject, "error", "warm");
                                     boxBean.setFailStr(error);
                                     break;
                                 }
                             }
                         }
                         mUpperShelfBoxAdapter.notifyDataSetChanged();
-                        CommonUtil.toastNoRepeat(mActivity, "上架失败，无法上架箱号已标红");
+                        if (errorCount > 0) {
+                            CommonUtil.toastNoRepeat(mActivity, "上架失败，无法上架箱号已标红");
+                        } else if (warnCount > 0) {
+                            new AlertDialog.Builder(mActivity)
+                                    .setTitle("提示")
+                                    .setMessage("存在箱号已上架，是都重复上架？")
+                                    .setNegativeButton("取消", null)
+                                    .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            confirmUpshelf(true);
+                                        }
+                                    }).show();
+                        }
                     }
                 } catch (Exception e) {
                     e.printStackTrace();

app/src/main/java/com/uas/jlt_storage/fragment/JltStorageInFilterListFragment.java

@@ -75,6 +75,12 @@ public class JltStorageInFilterListFragment extends BaseFragment implements JLTS
         mSearchCet = root.findViewById(R.id.jlt_storage_in_filter_list_search_cet);
         mSearchTv = root.findViewById(R.id.jlt_storage_in_filter_list_search_tv);
         mMultipleTv = root.findViewById(R.id.jlt_storage_in_filter_list_multiple_tv);
+        mSearchCet.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mSearchCet.requestFocus();
+            }
+        }, 100);
 
         mStorageInBeans = new ArrayList<>();
         mFilterStorageInBeans = new ArrayList<>();
@@ -314,8 +320,15 @@ public class JltStorageInFilterListFragment extends BaseFragment implements JLTS
 
     private void setFilterTableData(List<JLTStorageInBean> filterTableData) {
         mTableData = new TableData<JLTStorageInBean>("入库单列表", filterTableData,
-                mCheckColumn, mNumColumn, mClassColumn, mSupplierColumn, mWhcodeColumn, mWhcodeDesColumn,mStateColumn);
+                mCheckColumn, mNumColumn, mClassColumn, mSupplierColumn, mWhcodeColumn, mWhcodeDesColumn, mStateColumn);
         mSmartTable.setTableData(mTableData);
+//        mSmartTable.requestLayout();
+        mSmartTable.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mSmartTable.postInvalidate();
+            }
+        }, 100);
 
         filterAllSelect();
     }

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

@@ -27,7 +27,7 @@
                 android:id="@+id/jlt_pick_material_out_num_et"
                 style="@style/EditTextStyle"
                 android:hint="出库单号"
-                />
+                android:selectAllOnFocus="true" />
 
             <ImageView
                 android:id="@+id/jlt_pick_material_out_clear_iv"

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

@@ -28,7 +28,8 @@
         <com.uas.jlt_storage.view.ClearableEditText
             android:id="@+id/jlt_stock_inquiry_location_location_et"
             style="@style/inputItemValue"
-            android:hint="请采集箱号" />
+            android:hint="请采集箱号"
+            android:selectAllOnFocus="true" />
     </LinearLayout>
 
     <LinearLayout

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

@@ -26,7 +26,8 @@
         <com.uas.jlt_storage.view.ClearableEditText
             android:id="@+id/jlt_stock_inquiry_model_model_et"
             style="@style/inputItemValue"
-            android:hint="请输入型号" />
+            android:hint="请输入型号"
+            android:selectAllOnFocus="true"  />
     </LinearLayout>
 
     <LinearLayout

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

@@ -29,7 +29,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="#333333"
-            tools:text="SD12312435341,SD12312435341,SD12312435341,SD12312435341,SD12312435341" />
+            tools:text="SD12312435341" />
     </LinearLayout>
 
     <LinearLayout

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

@@ -42,6 +42,7 @@
     <color name="black_blue">#091027</color>
     <color name="green">#14B16C</color>
     <color name="red">#ff0000</color>
+    <color name="orange">#FF9B00</color>
 
     <color name="blueq1">#3875D6</color>
     <color name="blue1">#33A1C9</color>