智能上架优化

app/build.gradle

@@ -39,11 +39,11 @@ android {
             def outputFile = output.outputFile
             def fileName
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
-                if (variant.buildType.name.equals('release')) {
+                if (variant.buildType.name == 'release') {
                     def releaseInfo = getVersionName()
                     fileName = "思拓微${releaseInfo}.apk"
 
-                } else if (variant.buildType.name.equals('debug')) {
+                } else if (variant.buildType.name == 'debug') {
                     def debugInfo = getVersionName()
                     fileName = "UAS_uas_mes_stw_DEBUG_${debugInfo}.apk"
                 }

app/src/main/java/com/uas/uas_mes_stw/fragment/GoodBadAddListFragment.java

@@ -107,7 +107,7 @@ public class GoodBadAddListFragment extends BaseFragment implements HttpCallback
         if (mWhichPage == PAGE_STORAGE_FUNACTION
                 || mWhichPage == PAGE_STORAGE_ADD
                 || mWhichPage == PAGE_STORAGE_DETAIL) {
-            FunctionActivity.setTitle("入库单列表("+pi_type+")");
+            FunctionActivity.setTitle("入库单列表");//("+pi_type+")
         } else if (mWhichPage == PAGE_OUT_DETAIL) {
             FunctionActivity.setTitle("出库单列表");
         } else if (mWhichPage == PAGE_OUT_HISTORY) {
@@ -426,7 +426,7 @@ public class GoodBadAddListFragment extends BaseFragment implements HttpCallback
             if (mWhichPage == PAGE_STORAGE_FUNACTION
                     || mWhichPage == PAGE_STORAGE_ADD
                     || mWhichPage == PAGE_STORAGE_DETAIL) {
-                FunctionActivity.setTitle("入库单列表("+pi_type+")");
+                FunctionActivity.setTitle("入库单列表");//("+pi_type+")
             } else if (mWhichPage == PAGE_OUT_DETAIL) {
                 FunctionActivity.setTitle("出库单列表");
             } else if (mWhichPage == PAGE_OUT_HISTORY) {

app/src/main/java/com/uas/uas_mes_stw/fragment/GoodOrBadAddDetailFragment.java

@@ -518,7 +518,7 @@ public class GoodOrBadAddDetailFragment extends BaseFragment implements View.OnC
         if (hidden) {
             ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
         } else {
-            FunctionActivity.setTitle("入库单列表("+pi_type+")");
+            FunctionActivity.setTitle("入库单列表");//("+pi_type+")
             ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
             ((FunctionActivity) getActivity()).setListIconIvVisible(false);
         }

app/src/main/java/com/uas/uas_mes_stw/fragment/GoodOrBadFragment.java

@@ -140,7 +140,7 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
 
         pi_class = SharedPreUtil.getString(mActivity, "pi_class", null);
         pi_type = SharedPreUtil.getString(mActivity, "pi_type", null);
-        FunctionActivity.setTitle("新增入库("+pi_type+")");
+        FunctionActivity.setTitle("新增入库");//("+pi_type+")
 
         Log.e("pi_class",pi_class);
         storage_in_add_detail_commit_btn.setOnClickListener(this);
@@ -721,7 +721,7 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
             ((FunctionActivity) getActivity()).setListIconIvVisible(false);
             ((FunctionActivity) getActivity()).setScanIvVisible(false);
         } else {
-            FunctionActivity.setTitle("新增入库("+pi_type+")");
+            FunctionActivity.setTitle("新增入库");//("+pi_type+")
 
             ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
             ((FunctionActivity) getActivity()).setListIconIvVisible(true);

app/src/main/java/com/uas/uas_mes_stw/fragment/IOCOutMakeMaterialOper.java

@@ -779,10 +779,30 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
             public void onResponse(JSONObject jsonObject) {
                 progressDialog.dismiss();
                 try {
-//                    JSONObject dataObject = jsonObject.optJSONObject("data");
+                    Log.e("jsonObject",jsonObject.toString());
+                    JSONObject dataObject = jsonObject.optJSONObject("data");
+                    JSONObject dataData = dataObject.optJSONObject("next");
+                    Object log = dataObject.get("log");
+                    String bar_prodcode = dataData.getString("PD_PRODCODE");//编号
+                    String pr_detail = dataData.getString("PR_DETAIL");//名称
+                    String pr_spec = dataData.getString("PR_SPEC");//规格
+                    String pd_outqty = dataData.getString("PD_OUTQTY");//出库数量
+                    String pd_restqty = dataData.getString("PD_RESTQTY");
+                    String pr_zxbzs = dataData.getString("PR_ZXBZS");
+                    String bar_remain = dataData.getString("BAR_REMAIN");
+                    String dc = dataData.getString("DC");
                     mCollectResultTextView.setVisibility(View.VISIBLE);
-                    mCollectResultTextView.setTextColor(getResources().getColor(R.color.blue));
-                    mCollectResultTextView.setText(jsonObject.toString());
+                    mCollectResultTextView.setText(log.toString());
+                    mMaterialInforTextView.setText("物料："+bar_prodcode
+                                                    +"名称："+pr_detail
+                                                    +"规格："+pr_spec
+                                                    +"未备料数："+pd_restqty
+                                                    +"批数量："+bar_remain
+                                                    +"DC："+dc
+                    );
+
+
+                    getNextMaterialInfo();
 //                    JSONObject messageObject = dataObject.getJSONObject("barcode");
                     CommonUtil.toastNoRepeat(mActivity, "货架点亮成功");
                 } catch (Exception e) {
@@ -827,12 +847,12 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
             public void onResponse(JSONObject jsonObject) {
                 progressDialog.dismiss();
                 try {
-//                    JSONObject dataObject = jsonObject.optJSONObject("data");
+                    JSONObject dataObject = jsonObject.optJSONObject("data");
                     mCollectResultTextView.setVisibility(View.VISIBLE);
                     mCollectResultTextView.setTextColor(getResources().getColor(R.color.blue));
-                    mCollectResultTextView.setText(jsonObject.toString());
+                    mCollectResultTextView.setText(dataObject.toString());
 //                    JSONObject messageObject = dataObject.getJSONObject("barcode");
-                    CommonUtil.toastNoRepeat(mActivity, jsonObject.toString());
+                    CommonUtil.toastNoRepeat(mActivity, dataObject.toString());
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

app/src/main/java/com/uas/uas_mes_stw/fragment/SmartShelvestFragment.java

@@ -83,7 +83,11 @@ public class SmartShelvestFragment extends BaseFragment {
         CommonUtil.setEditorActionListener(mLocationEditText, new MyEditorActionListener() {
             @Override
             public void MyEditorAction(String text, int actionId, KeyEvent event) {
-
+                if (!text.isEmpty()&&!mBarcodeEditText.getText().toString().isEmpty()){
+                    saveBarAcceptCode("0");
+                }else {
+                    mBarcodeEditText.requestFocus();
+                }
             }
         });
 
@@ -93,10 +97,10 @@ public class SmartShelvestFragment extends BaseFragment {
             public void onCheckedChanged(RadioGroup radioGroup, int checkid) {
                 switch (checkid){
                     case R.id.rb_zhuanchu:
-                        rb_changeinter = "0";
+                        rb_changeinter = "1";
                         break;
                     case R.id.rb_chexiao:
-                        rb_changeinter = "1";
+                        rb_changeinter = "0";
                         break;
                 }
             }
@@ -170,14 +174,21 @@ public class SmartShelvestFragment extends BaseFragment {
                     String BAR_WHCODE = dataObject.getString("BAR_WHCODE") == null ? "" : dataObject.getString("BAR_WHCODE");
                     String PR_LOCATION = dataObject.getString("PR_LOCATION") == null ? "" : dataObject.getString("PR_LOCATION");
                     String LOCATION = dataObject.getString("LOCATION") == null ? "" : dataObject.getString("LOCATION");
+                    String TYPE = dataObject.getString("TYPE") == null ? "" : dataObject.getString("TYPE");
                     mResultTextView.setTextColor(Color.BLUE);
                     mResultTextView.setVisibility(View.VISIBLE);
-                    mResultTextView.setText("编号："+BAR_PRODCODE+" 数量："+BAR_REMAIN
-                                            +"\n名称"+PR_DETAIL
+                    mResultTextView.setText(TYPE+"："+mBarcodeEditText.getText().toString().trim()
+                                            +"\n编号："+BAR_PRODCODE+" 数量："+BAR_REMAIN
+                                            +"\n物料"+PR_DETAIL
                                             +"\n规格"+PR_SPEC
-                                            +"\n默认仓库："+PR_LOCATION
-                                            +"\n目前仓位；"+BAR_LOCATION
+                                            +"\n默认仓位："+PR_LOCATION
+                                            +"\n目前仓位："+BAR_LOCATION
                                             +"\n建议仓位："+LOCATION);
+                    if (!mLocationEditText.getText().toString().isEmpty()&&!mBarcodeEditText.getText().toString().isEmpty()){
+                        saveBarAcceptCode("0");
+                    }else {
+                        mLocationEditText.requestFocus();
+                    }
                 }
 
                 @Override
@@ -226,15 +237,19 @@ public class SmartShelvestFragment extends BaseFragment {
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
                 mResultTextView.setVisibility(View.VISIBLE);
-                mResultTextView.setText(null);
-                mBarcodeEditText.setText(null);
-                mLocationEditText.setText(null);
                 mResultTextView.setTextColor(getResources().getColor(R.color.blue));
 
+
+
                 JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(),"data");
                 String LOG = dataObject.getString("log") == null ? "" : dataObject.getString("log");
                 String IFMIX = dataObject.getString("ifmix") == null ? "" : dataObject.getString("ifmix");
                 String PRODCODE = dataObject.getString("prodcode") == null ? "" : dataObject.getString("prodcode");
+                if (StringUtil.isEmpty(IFMIX)){
+                    mResultTextView.setText(null);
+                    mBarcodeEditText.setText(null);
+                    mLocationEditText.setText(null);
+                }
                 if (StringUtil.isEmpty(IFMIX)){
                     mResultTextView.setText(LOG);
                 }else {

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

@@ -133,7 +133,28 @@
                 android:textColor="@color/body_text_1"
                 android:textSize="16sp" />
         </TableRow>
+        <TableRow
+            android:layout_marginTop="5dp">
 
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="领料数量"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/tv_lingqty"
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="left"
+                android:padding="10dp"
+                android:text=""
+                android:maxLines="2"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+        </TableRow>
         <TableRow
             android:layout_marginTop="5dp">
 

build.gradle

@@ -50,8 +50,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 13,
-            versionName      : "v1.0.3"
+            versionCode      : 16,
+            versionName      : "v1.0.6"
     ]
 
     depsVersion = [