出库逻辑修改

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

@@ -420,6 +420,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
     private TextView mCollectResultTextView;
     private TextView mCollectBarProdcodeTv;
     private CheckBox special_check;
+    private CheckBox more_check;
     private TextView text_finishno;
 
     @Override
@@ -453,6 +454,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         mMaterialInforTextView = root.findViewById(R.id.iocout_next_material_information);
         mCollectResultTextView = root.findViewById(R.id.iocout_collect_result);
         special_check = root.findViewById(R.id.special_check);
+        more_check = root.findViewById(R.id.more_check);
 
         text_finishno = root.findViewById(R.id.text_finishno);
 
@@ -748,6 +750,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
     private void barcodeEnterEvent(boolean msdcheck, boolean datecheck) {
         progressDialog.show();
         boolean checkeds = special_check.isChecked();
+        boolean more_is = more_check.isChecked();
 //        currentBarcode = etBarCode.getText().toString().trim();
         String url = (isMultiple ? GloableParams.ADDRESS_OUT_BYBATCH_DEAL : GloableParams.ADDRESS_OUT_BYBATCH_DEAL)
                 + "?barcode=" + currentBarcode
@@ -755,7 +758,8 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                 + pi_id + "&whcode=" + pd_whcode
                 + "&type=barcode&msdcheck=" + msdcheck
                 + "&datecheck=" + datecheck
-                +"&ifspecial="+checkeds;
+                +"&ifspecial="+checkeds
+                +"&isover="+more_is;
         try {
             if (mProdOutType != null && mCollectType != null) {
                 if (mProdOutType.equals("byProdcode")) {
@@ -766,7 +770,8 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 + pi_id + "&whcode=" + pd_whcode
                                 + "&type=barcode&msdcheck=" + msdcheck
                                 + "&datecheck=" + datecheck
-                                +"&ifspecial="+checkeds;
+                                +"&ifspecial="+checkeds
+                                +"&isover="+more_is;
 
                     } else if (mCollectType.equals("byBatchcode")) {
                         url = (isMultiple ? GloableParams.ADDRESS_OUT_BYBATCH_DEAL : GloableParams.ADDRESS_OUT_BYBATCH_DEAL)
@@ -775,7 +780,8 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 + pi_id + "&whcode=" + pd_whcode
                                 + "&type=boxcode&msdcheck=" + msdcheck
                                 + "&datecheck=" + datecheck
-                                +"&ifspecial="+checkeds;
+                                +"&ifspecial="+checkeds
+                                +"&isover="+more_is;
                     }
                 } else if (mProdOutType.equals("byBatch")) {
                     if (mCollectType.equals("byBarcode")) {
@@ -785,7 +791,8 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 + pi_id + "&whcode=" + pd_whcode
                                 + "&type=barcode&msdcheck=" + msdcheck
                                 + "&datecheck=" + datecheck
-                                +"&ifspecial="+checkeds;
+                                +"&ifspecial="+checkeds
+                                +"&isover="+more_is;
                     } else if (mCollectType.equals("byBatchcode")) {
                         url = (isMultiple ? GloableParams.ADDRESS_OUT_BYBATCH_DEAL : GloableParams.ADDRESS_OUT_BYBATCH_DEAL)
                                 + "?barcode=" + URLEncoder.encode(currentBarcode, "utf-8")
@@ -793,7 +800,8 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 + pi_id + "&whcode=" + pd_whcode
                                 + "&type=boxcode&msdcheck=" + msdcheck
                                 + "&datecheck=" + datecheck
-                                +"&ifspecial="+checkeds;
+                                +"&ifspecial="+checkeds
+                                +"&isover="+more_is;
                     }
 
                 }

app/src/main/java/com/uas/lcp_newelectronic/fragment/WHCheckBarcodeFragment.java

@@ -38,6 +38,7 @@ public class WHCheckBarcodeFragment extends BaseFragment implements View.OnClick
     private TextView btnSearch;
     private ImageView mScanImageView;
     private int mFocusId;
+    private TextView tv_status;
 
     @Override
     protected int getLayout() {
@@ -60,6 +61,7 @@ public class WHCheckBarcodeFragment extends BaseFragment implements View.OnClick
         tvBarLocation = (TextView) root.findViewById(R.id.tv_bar_location);
         tvStatus = root.findViewById(R.id.tv_bar_status);
         btnSearch = (TextView) root.findViewById(R.id.btn_collect);
+        tv_status = (TextView) root.findViewById(R.id.tv_status);
         ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(R.string.title_barcode_whmm);
         mScanImageView = (ImageView) mActivity.findViewById(R.id.btn_actionbar_scan_iv);
 
@@ -191,7 +193,8 @@ public class WHCheckBarcodeFragment extends BaseFragment implements View.OnClick
             String strLocation = changeNulltoBlank(dataJson, "BAR_LOCATION");
             String strStatus = changeNulltoBlank(dataJson, "BAR_STATUS");
             String strType=changeNulltoBlank(dataJson,"PR_ORISPECCODE");
-
+            String stauts=changeNulltoBlank(dataJson,"STATUS");
+            tv_status.setText(stauts);
             //显示数据
             tvBarcode.setText(strBarcode);
             tvBarProcode.setText(strProduct);
@@ -209,6 +212,7 @@ public class WHCheckBarcodeFragment extends BaseFragment implements View.OnClick
             }else{
                tvStatus.setText(strStatus);
             }
+
         } catch (JSONException e) {
             e.printStackTrace();
         }

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

@@ -69,6 +69,7 @@
                         android:layout_width="0dp"
                         android:lines="1"
                         android:layout_weight="1"
+                        android:text="erp.e-powertalk.com"
                         android:hint="@string/hint_fragment_serverconnect_ip" />
 
                     <ImageView
@@ -114,7 +115,7 @@
                 android:hint="@string/hint_fragment_serverconnect_port"
                 android:lines="1"
                 android:imeOptions="actionDone"
-                android:text="8090" />
+                android:text="8099" />
 
             <Button
                 android:id="@+id/btn_submit_conncetserver_fragment"

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

@@ -108,6 +108,15 @@
                         android:textColor="@color/body_text_1"
                         android:textSize="14sp"
                         tools:text="YS1506002" />
+                    <CheckBox
+                        android:id="@+id/more_check"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:text="不结批"
+                        android:layout_marginRight="5dp">
+                    </CheckBox>
                     <CheckBox
                         android:id="@+id/special_check"
                         android:layout_width="wrap_content"

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

@@ -124,5 +124,15 @@
                 style="@style/Table_li_right"
                 android:textColor="@color/text_search"/>
         </TableRow>
+        <TableRow>
+            <TextView
+                style="@style/Table_li_left"
+                android:text="工单占用"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:id="@+id/tv_status"
+                style="@style/Table_li_right"
+                android:textColor="@color/text_search"/>
+        </TableRow>
     </TableLayout>
 </LinearLayout>