فهرست منبع

及时成本报表

姜永辉 1 روز پیش
والد
کامیت
e7abf81407

+ 1 - 1
app/build.gradle

@@ -12,7 +12,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 3
-        versionName "23.03.27.01"
+        versionName "26.04.14.01"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //添加到此处
         multiDexEnabled true

+ 1 - 1
app/src/main/java/com/dongkesoft/iboss/activity/report/InventoryCostDetailActivity.java

@@ -236,7 +236,7 @@ public class InventoryCostDetailActivity extends IBossBaseActivity {
 			tvLastInventoryQuantity.setText(bean.getLastInventoryQuantity());
 			
 			String lastInventoryAmount = CommonUtil.format("###,###.##",Double.parseDouble(bean.getLastInventoryAmount()));
-			tvLastInventoryAmount.setText("¥" +lastInventoryAmount);
+			tvLastInventoryAmount.setText("¥" + bean.getLastInventoryAmount());
 			tvThisInventoryQuantity.setText(bean.getThisInventoryQuantity());
 			String thisInventoryAmount = CommonUtil.format("###,###.##",Double.parseDouble(bean.getThisInventoryAmount()));
 			tvThisInventoryAmount.setText("¥" +thisInventoryAmount);

+ 2 - 0
app/src/main/java/com/dongkesoft/iboss/activity/report/InventoryCostListActivity.java

@@ -949,6 +949,8 @@ public class InventoryCostListActivity extends IBossBaseActivity implements OnCl
 										info.setOccupyQuantity(occupyQuantity);
 										info.setInventoryCost(NumberUtil.DoubleToString(jsonObject1.optDouble("CostPrice")));
 										info.setInventoryAmount(NumberUtil.DoubleToString(jsonObject1.optDouble("InventoryAmount")));
+										info.setTimelyCost(NumberUtil.DoubleToString(jsonObject1.optDouble("TimelyCost")));
+										info.setInventoryTimelyAmount(NumberUtil.DoubleToString(jsonObject1.optDouble("InventoryTimelyAmount")));
 										mSearchInfoList.add(info);
 
 									}

+ 1 - 1
app/src/main/java/com/dongkesoft/iboss/adapter/InventoryCostsearchAdapter.java

@@ -58,7 +58,7 @@ public class InventoryCostsearchAdapter extends IBossBaseAdapter<SearchInfo> {
 		//库存成本
 		tvInventoryCost.setText(mData.get(position).getTimelyCost());
 		//库存金额
-		tvInventoryAmount.setText(mData.get(position).getInventoryAmount());
+		tvInventoryAmount.setText(mData.get(position).getInventoryTimelyAmount());
 		tvCansaleQuantity.setText(mData.get(position).getInventoryQuantity());
 		tvColorCode.setText(mData.get(position).getColorNumber().toString());
 		positionNumber.setText(mData.get(position).getPositionNumber());

+ 6 - 6
build.gradle

@@ -8,10 +8,10 @@ buildscript {
         maven{ url 'https://maven.aliyun.com/repository/google' }
         maven{ url 'https://maven.aliyun.com/repository/jcenter' }
         maven{ url 'https://maven.aliyun.com/repository/public' }
-        maven { url 'http://download.flutter.io' }
+        maven { url 'https://download.flutter.io' }
         maven { url "https://oss.sonatype.org/content/groups/public" }
-        maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
-        maven { url 'http://developer.huawei.com/repo/' }
+        maven { url "https://maven.aliyun.com/nexus/content/groups/public/" }
+        maven { url 'https://developer.huawei.com/repo/' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.1'
@@ -27,10 +27,10 @@ allprojects {
         maven{ url 'https://maven.aliyun.com/repository/google' }
         maven{ url 'https://maven.aliyun.com/repository/jcenter' }
         maven{ url 'https://maven.aliyun.com/repository/public' }
-        maven { url 'http://download.flutter.io' }
+        maven { url 'https://download.flutter.io' }
         maven { url "https://oss.sonatype.org/content/groups/public" }
-        maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
-        maven { url 'http://developer.huawei.com/repo/' }
+        maven { url "https://maven.aliyun.com/nexus/content/groups/public/" }
+        maven { url 'https://developer.huawei.com/repo/' }
         google()
         jcenter()
     }

+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip