1.0.18

app/build.gradle

@@ -9,7 +9,7 @@ android {
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.16"
+        versionName "1.0.18"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters 'armeabi', 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.16","enabled":true,"outputFile":"维科上料报工系统_v1.0.16.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.16.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.18","enabled":true,"outputFile":"维科上料报工系统_v1.0.18.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.18.apk","properties":{}}]

app/src/main/java/com/techscan/wk/rxretrofit/ApiService.java

@@ -92,6 +92,9 @@ public interface ApiService {
     @GET("/web/order/getByzboxid")
     Observable<ResponseBody> getByzboxid(@Query("zboxid") String zboxid);
 
+    @GET("/web/order/getStork")
+    Observable<ResponseBody> getStork(@Query("matnr") String matnr);
+
     @POST("/web/report/storage")
     Observable<ResponseBody> storage(@Body String json);
 

app/src/main/java/com/techscan/wk/rxretrofit/HttpMethods.java

@@ -378,6 +378,14 @@ public class HttpMethods {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(observer);
     }
+    public void getStork(String matnr,
+                             Observer<ResponseBody> observer) {
+        getApiService().getStork(matnr)
+                .subscribeOn(Schedulers.io())
+                .unsubscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(observer);
+    }
 
     public void getlgort(Observer<ResponseBody> observer) {
         getApiService().getlgort()

app/src/main/java/com/techscan/wk/ui/proreq/ProReqActivity.java

@@ -90,7 +90,8 @@ import q.rorbin.badgeview.QBadgeView;
 
 /**
  * Description:生产上料
- * [)>@06@QRPART@10V101010@1P11002734@3SX1000019400001@1T20240724001@Q20@14D20240724@@
+ * [)>@06@QRPART@10V101010@1P33700680@3SX1000019400001@1T20240724001@Q2000@14D20240724@@
+ *
  * @author MULEI
  * @date 2024/9/11
  */
@@ -202,10 +203,10 @@ public class ProReqActivity extends CommonFunctionActivity {
         boolean isHIDE_GW = PreferencesUtil.getBoolean(context, AppConst.HIDE_GW, false);
         for (int i = 0; i < dynamicFormBeans.size(); i++) {
             DynamicFormBean bean = dynamicFormBeans.get(i);
-            if(bean.getFieldName().equals("ZCJBM")){
+            if (bean.getFieldName().equals("ZCJBM")) {
                 bean.setShow(!isHIDE_CJ);
             }
-            if(bean.getFieldName().equals("ZGWH")){
+            if (bean.getFieldName().equals("ZGWH")) {
                 bean.setShow(!isHIDE_GW);
             }
         }
@@ -459,7 +460,7 @@ public class ProReqActivity extends CommonFunctionActivity {
             return;
         }
 
-        if(!checkNumber(quantity)){
+        if (!checkNumber(quantity)) {
             showError(getString(R.string.The_quantity_is_not_correct));
             setNextFocus("quantity");
             return;
@@ -500,7 +501,7 @@ public class ProReqActivity extends CommonFunctionActivity {
                             DialogUtil.showErrorInfoDialog(context, "当前数量" + quantity + "，历史已扫数量" + (finalHisScanNum + data) +
                                     "，已扫数量总和超过条码数量" + finalBarNum + "，请确认");
                         } else {
-                            addDetail(barDataBean,currenScanNum);
+                            chekcStock(barDataBean, currenScanNum);
                         }
                     }
                 }
@@ -512,15 +513,50 @@ public class ProReqActivity extends CommonFunctionActivity {
             });
 
         } else {
-            addDetail(barDataBean,currenScanNum);
+            chekcStock(barDataBean, currenScanNum);
         }
 
     }
 
+
+    private void chekcStock(AnalysisBarBean barDataBean, double currenScanNum) {
+        //计算出当前物料在明细中已扫描的数量
+        Double hisScanNum = LitePal.where("matnr = ? ", barDataBean.getMateriel()).sum(ProReqDetailBean.class, "erfmg", double.class);
+        HttpMethods.getInstance().getStork(barDataBean.getMateriel(), new BaseObserver<ResponseBody>(context) {
+            @Override
+            protected void onSuccess(ResponseBody body) throws Exception {
+                String string = body.string();
+                Type objectType = new TypeToken<BaseResponseBean<Double>>() {
+                }.getType();
+                BaseResponseBean<Double> baseResponseBean = gson.fromJson(string, objectType);
+                if (baseResponseBean.getCode() != 200) {
+                    showError(baseResponseBean.getMsg());
+                    return;
+                }
+                if (baseResponseBean.getData() != null) {
+                    //服务端返回该箱号已扫描数量
+                    double data = baseResponseBean.getData();
+                    if (hisScanNum + currenScanNum > data) {
+                        DialogUtil.showErrorInfoDialog(context, "当前数量" + currenScanNum + "，明细已扫数量" + hisScanNum +
+                                "，已扫数量总和超过库存数量" + data + "，请确认");
+                    } else {
+                        addDetail(barDataBean, currenScanNum);
+                    }
+                }
+            }
+
+            @Override
+            protected void onFailure(Throwable e) throws Exception {
+                CustomErrorDialog(e, ProReqActivity.this);
+            }
+        });
+    }
+
+
     /**
      * 加入明细方法
      */
-    private void addDetail(AnalysisBarBean barDataBean,double currenScanNum) {
+    private void addDetail(AnalysisBarBean barDataBean, double currenScanNum) {
         //DynamicFormBean ZLYSJItem = dynamicFormAdapter.getItemByFieldName("ZLYSJ");//领用时间
         DynamicFormBean ZCJBMItem = dynamicFormAdapter.getItemByFieldName("ZCJBM");//车间编码
         DynamicFormBean ZGWHItem = dynamicFormAdapter.getItemByFieldName("ZGWH");//工位号
@@ -632,7 +668,7 @@ public class ProReqActivity extends CommonFunctionActivity {
      * @param id 工单号
      */
     private void query(String id) {
-        HttpMethods.getInstance().getOrderInfo(id,true, new BaseObserver<ResponseBody>(context) {
+        HttpMethods.getInstance().getOrderInfo(id, true, new BaseObserver<ResponseBody>(context) {
             @Override
             protected void onSuccess(ResponseBody body) throws Exception {
                 String string = body.string();
@@ -942,10 +978,10 @@ public class ProReqActivity extends CommonFunctionActivity {
                 boolean isHIDE_GW = PreferencesUtil.getBoolean(context, AppConst.HIDE_GW, false);
                 for (int i = 0; i < dynamicFormBeans.size(); i++) {
                     DynamicFormBean bean = dynamicFormBeans.get(i);
-                    if(bean.getFieldName().equals("ZCJBM") ){
+                    if (bean.getFieldName().equals("ZCJBM")) {
                         bean.setShow(!isHIDE_CJ);
                     }
-                    if(bean.getFieldName().equals("ZGWH")){
+                    if (bean.getFieldName().equals("ZGWH")) {
                         bean.setShow(!isHIDE_GW);
                     }
                 }

app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkOffsetActivity.java

@@ -314,7 +314,7 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity {
                     QMUIDialog.MessageDialogBuilder messageDialogBuilder = new QMUIDialog.MessageDialogBuilder(context);
                     messageDialogBuilder.setTitle(getResources().getString(R.string.tips_title))
                             .setCancelable(false)
-                            .setMessage(getString(R.string.Data_saved_successfully))
+                            .setMessage(baseResponseBean.getData())
                             .addAction(getResources().getString(R.string.cancel_info), (dialog, index) -> dialog.dismiss())
                             .addAction(getResources().getString(R.string.confirm_info), (dialog, index) -> {
                                 dialog.dismiss();