wuhb пре 1 година
родитељ
комит
d326b7fdf4

+ 2 - 2
app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.ygtx.emcs"
         minSdk 27
         targetSdk 31
-        versionCode 1
-        versionName "1.2.1"
+        versionCode 2
+        versionName "1.1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

+ 0 - 1
app/src/main/java/com/ygtx/emcs/activity/AppInfoActivity.java

@@ -162,7 +162,6 @@ public class AppInfoActivity extends BaseActivity {
                 public void onClick(View v){
                     Constant.server_ip = inputServer.getText().toString();
                     Constant.HTTP_URL = "http://"+Constant.server_ip;
-                    Constant.UPDATE_URL = "http://"+Constant.server_ip+"/app";
                     binding.tvIp.setText(Constant.server_ip);
                     ToastUtils.showToast(context, "设置成功");
                     dialog.dismiss();

+ 1 - 1
app/src/main/java/com/ygtx/emcs/activity/HomeActivity.java

@@ -91,7 +91,7 @@ public class HomeActivity extends BaseActivity {
 //        binding.tvLoginName.setOnClickListener(v->{
 //            receiverTask("CK_20250304002");
 //        });
-//        update();
+        update();
     }
 
     private void checkNet(){

+ 4 - 3
app/src/main/java/com/ygtx/emcs/activity/StockPackageActivity.java

@@ -97,7 +97,7 @@ public class StockPackageActivity extends BaseActivity {
             return false;
         });
         binding.tvScanTips.setOnClickListener(view->{
-            receiverTask("CK_20250327007");
+            receiverTask("CK_20250329002");
         });
 //        binding.tvOutCode.setOnClickListener(view->{
 //            receiverTask("0220013310125");
@@ -159,6 +159,7 @@ public class StockPackageActivity extends BaseActivity {
         if(barcode.startsWith(out_stock_flag)){
             try {
                 binding.tvOutCode.setText(barcode);
+                erpOutstockCode = barcode;
                 loadErpTask(barcode);
             }catch (Throwable ex){
                 mylog.error("任务发送异常:", ex);
@@ -187,7 +188,7 @@ public class StockPackageActivity extends BaseActivity {
         String itemCode = values[0];
         String stockCode = values[3];
         if(!stockCode.equals(erpOutstockCode)){
-            ToastUtils.showToast(context, "不是当前出库单的物品");
+            ToastUtils.showToast(context, "物品出库单是"+stockCode);
             return;
         }
         BigDecimal perQty = new BigDecimal(values[1]);
@@ -218,7 +219,7 @@ public class StockPackageActivity extends BaseActivity {
                 }
             }else{
                 if(stockLineModel.getTotalPackage()
-                        .compareTo(new BigDecimal(stockLineModel.getQuantity())) >= 0){
+                        .compareTo(stockLineModel.getOrderQuantity()) >= 0){
                     ToastUtils.showToast(context, "已超过出库单数量");
                     return;
                 }

+ 1 - 1
app/src/main/java/com/ygtx/emcs/activity/adapter/StockPackingListViewAdapter.java

@@ -71,7 +71,7 @@ public class StockPackingListViewAdapter extends BaseAdapter {
         }
         mainHolder.tv_item_spec.setText(stockLineModel.getSpecification());
         mainHolder.tv_product_code.setText(stockLineModel.getItemCode());
-        mainHolder.qty.setText(stockLineModel.getQuantity());
+        mainHolder.qty.setText(stockLineModel.getOrderQuantity().toString());
         mainHolder.tv_product_name.setText(stockLineModel.getItemName());
         return view;
     }

+ 3 - 2
app/src/main/java/com/ygtx/emcs/util/Constant.java

@@ -24,9 +24,10 @@ public class Constant {
 
 //  修改 string.xml APP 名称 “宇光同行” 内网
     public static String PROJECT_NAME = "ygtx";
-    public static String server_ip = "192.168.120.222:8905";
+    public static String server_ip = "192.168.110.105:83";
+//    public static String server_ip = "192.168.120.222:8905";
     public static String HTTP_URL = "http://"+server_ip;
-    public static String UPDATE_URL = "http://"+server_ip+"/app";
+    public static String UPDATE_URL = "http://175.42.33.78:85";
 
     public static String ACCESS_TOKEN = "";
     public static String REFRESH_TOKEN = "";