Skip to content

S
supplier
Commit fa3ae8bf by Wyh
Options

1、整理供應鏈模塊文件

parent 1ed16be0
Showing with 95 additions and 70 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/common/core/print/bean/OrderDetails.kt
...@@ -98,6 +98,8 @@ class OrderDetails { ...@@ -98,6 +98,8 @@ class OrderDetails {
var orderStatus: Int = 0 var orderStatus: Int = 0
var addPoints: Double = 0.toDouble()//本次加多少積分 var addPoints: Double = 0.toDouble()//本次加多少積分
var oldPoints: Double = 0.toDouble()//之前有多少積分 var oldPoints: Double = 0.toDouble()//之前有多少積分
var nowPoints: Double = 0.toDouble()//現在有多少積分 var nowPoints: Double = 0.toDouble()//現在有多少積分
......
config.gradle
...@@ -7,8 +7,8 @@ ext { ...@@ -7,8 +7,8 @@ ext {
targetSdkVersion : 29, targetSdkVersion : 29,
//正式版: 1.0.3 3 //正式版: 1.0.3 3
//內部測試版:1.2.0 20 //內部測試版:1.2.0 20
versionCode : 13, versionCode : 16,
versionName : "1.1.3" versionName : "1.1.6"
] ]
version = [ version = [
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/OrderDetailsActivity.kt
...@@ -159,6 +159,7 @@ class OrderDetailsActivity : BaseActivity<IPresenter>() { ...@@ -159,6 +159,7 @@ class OrderDetailsActivity : BaseActivity<IPresenter>() {
val type = if (orderDetails.order_type == 7) "自取" else "外送" val type = if (orderDetails.order_type == 7) "自取" else "外送"
when (orderDetails.orderStatus) { when (orderDetails.orderStatus) {
2 -> {//製作中 2 -> {//製作中
//製作中訂單狀態為2，但是列表中的狀態為0的話，可能是調用了指派物流，沒修改訂單狀態
if (state == 0) { if (state == 0) {
//防止調用了第三方物流接口，沒調用到確認訂單接口 //防止調用了第三方物流接口，沒調用到確認訂單接口
btnBuilder.getSureBtn()?.let { btnBuilder.getSureBtn()?.let {
...@@ -299,9 +300,10 @@ class OrderDetailsActivity : BaseActivity<IPresenter>() { ...@@ -299,9 +300,10 @@ class OrderDetailsActivity : BaseActivity<IPresenter>() {
} else { } else {
GridLayoutManager(this@OrderDetailsActivity, spanCount) GridLayoutManager(this@OrderDetailsActivity, spanCount)
} }
//recyclerview按鈕數量佈局
gridLayoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() { gridLayoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
override fun getSpanSize(position: Int): Int { override fun getSpanSize(position: Int): Int {
//5個按鈕，第五個的position=4. 4 //5個按鈕，第五個的position=4
return if (position < spanCount) { return if (position < spanCount) {
1 1
} else { } else {
......
delivery_pick_module/src/main/res/layout/layout_more_popup.xml
...@@ -8,15 +8,16 @@ ...@@ -8,15 +8,16 @@
android:id="@+id/tv_new_order" android:id="@+id/tv_new_order"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="@dimen/dp_20" android:paddingLeft="@dimen/dp_20"
android:layout_gravity="center_horizontal"
android:paddingTop="@dimen/dp_10" android:paddingTop="@dimen/dp_10"
android:paddingRight="@dimen/dp_20" android:paddingRight="@dimen/dp_20"
android:paddingBottom="@dimen/dp_10" android:paddingBottom="@dimen/dp_10"
android:text="新訂單" android:text="新訂單"
android:textColor="@color/theme_333_color" android:textColor="@color/theme_333_color"
android:textSize="@dimen/dp_14" /> android:textSize="@dimen/dp_14"
android:visibility="gone" />
<include layout="@layout/include_horizontal_color_ccc_dividing_line" /> <include layout="@layout/include_horizontal_color_ccc_dividing_line" />
......
supply-chain-module/src/main/AndroidManifest.xml
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
<activity <activity
android:name=".mvp.ui.activity.SupplyChainMainActivity" android:name=".mvp.ui.activity.SupplyChainMainActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<meta-data <meta-data
android:name="com.gingersoft.gsa.cloud.common.config.globalconfig.GlobalConfiguration" android:name="com.gingersoft.gsa.cloud.common.config.globalconfig.GlobalConfiguration"
android:value="ConfigModule" /> android:value="ConfigModule" />
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/di/component/CategoryComponent.java
...@@ -9,8 +9,7 @@ import com.gingersoft.supply_chain.di.module.CategoryModule; ...@@ -9,8 +9,7 @@ import com.gingersoft.supply_chain.di.module.CategoryModule;
import com.gingersoft.supply_chain.mvp.contract.CategoryContract; import com.gingersoft.supply_chain.mvp.contract.CategoryContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.supply_chain.mvp.ui.fragment.CategoryFragment; import com.gingersoft.supply_chain.mvp.ui.fragment.category.CategoryFragment;
/** /**
* ================================================ * ================================================
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/di/component/CategorySelectComponent.java
...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component; ...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component;
import dagger.BindsInstance; import dagger.BindsInstance;
import dagger.Component; import dagger.Component;
import com.gingersoft.supply_chain.mvp.ui.fragment.category.CategorySelectFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.gingersoft.supply_chain.di.module.CategorySelectModule; import com.gingersoft.supply_chain.di.module.CategorySelectModule;
import com.gingersoft.supply_chain.mvp.contract.CategorySelectContract; import com.gingersoft.supply_chain.mvp.contract.CategorySelectContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.supply_chain.mvp.ui.fragment.CategorySelectFragment;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/di/component/ConfirmOrderComponent.java
...@@ -2,13 +2,14 @@ package com.gingersoft.supply_chain.di.component; ...@@ -2,13 +2,14 @@ package com.gingersoft.supply_chain.di.component;
import dagger.BindsInstance; import dagger.BindsInstance;
import dagger.Component; import dagger.Component;
import com.gingersoft.supply_chain.mvp.ui.fragment.order.ConfirmOrderFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.gingersoft.supply_chain.di.module.ConfirmOrderModule; import com.gingersoft.supply_chain.di.module.ConfirmOrderModule;
import com.gingersoft.supply_chain.mvp.contract.ConfirmOrderContract; import com.gingersoft.supply_chain.mvp.contract.ConfirmOrderContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.supply_chain.mvp.ui.fragment.ConfirmOrderFragment;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/di/component/FoodIngredientCategoryComponent.java
...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component; ...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component;
import dagger.BindsInstance; import dagger.BindsInstance;
import dagger.Component; import dagger.Component;
import com.gingersoft.supply_chain.mvp.ui.fragment.food.FoodIngredientCategoryFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.gingersoft.supply_chain.di.module.FoodIngredientCategoryModule; import com.gingersoft.supply_chain.di.module.FoodIngredientCategoryModule;
import com.gingersoft.supply_chain.mvp.contract.FoodIngredientCategoryContract; import com.gingersoft.supply_chain.mvp.contract.FoodIngredientCategoryContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.supply_chain.mvp.ui.fragment.FoodIngredientCategoryFragment;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/di/component/FoodIngredientsComponent.java
...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component; ...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component;
import dagger.BindsInstance; import dagger.BindsInstance;
import dagger.Component; import dagger.Component;
import com.gingersoft.supply_chain.mvp.ui.fragment.food.FoodIngredientsFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.gingersoft.supply_chain.di.module.FoodIngredientsModule; import com.gingersoft.supply_chain.di.module.FoodIngredientsModule;
import com.gingersoft.supply_chain.mvp.contract.FoodIngredientsContract; import com.gingersoft.supply_chain.mvp.contract.FoodIngredientsContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.supply_chain.mvp.ui.fragment.FoodIngredientsFragment;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/di/component/MeasurementUnitComponent.java
...@@ -2,7 +2,7 @@ package com.gingersoft.supply_chain.di.component; ...@@ -2,7 +2,7 @@ package com.gingersoft.supply_chain.di.component;
import com.gingersoft.supply_chain.di.module.MeasurementUnitModule; import com.gingersoft.supply_chain.di.module.MeasurementUnitModule;
import com.gingersoft.supply_chain.mvp.contract.MeasurementUnitContract; import com.gingersoft.supply_chain.mvp.contract.MeasurementUnitContract;
import com.gingersoft.supply_chain.mvp.ui.fragment.MeasurementUnitFragment; import com.gingersoft.supply_chain.mvp.ui.fragment.food.MeasurementUnitFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/di/component/NewFoodIngredientsComponent.java
...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component; ...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component;
import dagger.BindsInstance; import dagger.BindsInstance;
import dagger.Component; import dagger.Component;
import com.gingersoft.supply_chain.mvp.ui.fragment.food.NewFoodIngredientsFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.gingersoft.supply_chain.di.module.NewFoodIngredientsModule; import com.gingersoft.supply_chain.di.module.NewFoodIngredientsModule;
import com.gingersoft.supply_chain.mvp.contract.NewFoodIngredientsContract; import com.gingersoft.supply_chain.mvp.contract.NewFoodIngredientsContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.supply_chain.mvp.ui.fragment.NewFoodIngredientsFragment;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/di/component/NewFoodUnitComponent.java
...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component; ...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component;
import dagger.BindsInstance; import dagger.BindsInstance;
import dagger.Component; import dagger.Component;
import com.gingersoft.supply_chain.mvp.ui.fragment.food.NewFoodUnitFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.gingersoft.supply_chain.di.module.NewFoodUnitModule; import com.gingersoft.supply_chain.di.module.NewFoodUnitModule;
import com.gingersoft.supply_chain.mvp.contract.NewFoodUnitContract; import com.gingersoft.supply_chain.mvp.contract.NewFoodUnitContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.supply_chain.mvp.ui.fragment.NewFoodUnitFragment;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/di/component/NewSupplierComponent.java
...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component; ...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component;
import dagger.BindsInstance; import dagger.BindsInstance;
import dagger.Component; import dagger.Component;
import com.gingersoft.supply_chain.mvp.ui.fragment.supplier.NewSupplierFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.gingersoft.supply_chain.di.module.NewSupplierModule; import com.gingersoft.supply_chain.di.module.NewSupplierModule;
import com.gingersoft.supply_chain.mvp.contract.NewSupplierContract; import com.gingersoft.supply_chain.mvp.contract.NewSupplierContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.supply_chain.mvp.ui.fragment.NewSupplierFragment;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/di/component/OrderContentComponent.java
...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component; ...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component;
import dagger.BindsInstance; import dagger.BindsInstance;
import dagger.Component; import dagger.Component;
import com.gingersoft.supply_chain.mvp.ui.fragment.order.OrderContentFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.gingersoft.supply_chain.di.module.OrderContentModule; import com.gingersoft.supply_chain.di.module.OrderContentModule;
import com.gingersoft.supply_chain.mvp.contract.OrderContentContract; import com.gingersoft.supply_chain.mvp.contract.OrderContentContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.supply_chain.mvp.ui.fragment.OrderContentFragment;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/di/component/PackageSpecificationComponent.java
...@@ -9,7 +9,7 @@ import com.gingersoft.supply_chain.di.module.PackageSpecificationModule; ...@@ -9,7 +9,7 @@ import com.gingersoft.supply_chain.di.module.PackageSpecificationModule;
import com.gingersoft.supply_chain.mvp.contract.PackageSpecificationContract; import com.gingersoft.supply_chain.mvp.contract.PackageSpecificationContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.supply_chain.mvp.ui.fragment.PackageSpecificationFragment; import com.gingersoft.supply_chain.mvp.ui.fragment.food.PackageSpecificationFragment;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/di/component/PurchaseListComponent.java
...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component; ...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component;
import dagger.BindsInstance; import dagger.BindsInstance;
import dagger.Component; import dagger.Component;
import com.gingersoft.supply_chain.mvp.ui.fragment.order.PurchaseListFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.gingersoft.supply_chain.di.module.PurchaseListModule; import com.gingersoft.supply_chain.di.module.PurchaseListModule;
import com.gingersoft.supply_chain.mvp.contract.PurchaseListContract; import com.gingersoft.supply_chain.mvp.contract.PurchaseListContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.supply_chain.mvp.ui.fragment.PurchaseListFragment;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/di/component/SendMsgComponent.java
...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component; ...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component;
import dagger.BindsInstance; import dagger.BindsInstance;
import dagger.Component; import dagger.Component;
import com.gingersoft.supply_chain.mvp.ui.fragment.order.SendMsgFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.gingersoft.supply_chain.di.module.SendMsgModule; import com.gingersoft.supply_chain.di.module.SendMsgModule;
import com.gingersoft.supply_chain.mvp.contract.SendMsgContract; import com.gingersoft.supply_chain.mvp.contract.SendMsgContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.supply_chain.mvp.ui.fragment.SendMsgFragment;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/di/component/StorageListComponent.java
...@@ -9,7 +9,7 @@ import com.gingersoft.supply_chain.di.module.StorageListModule; ...@@ -9,7 +9,7 @@ import com.gingersoft.supply_chain.di.module.StorageListModule;
import com.gingersoft.supply_chain.mvp.contract.StorageListContract; import com.gingersoft.supply_chain.mvp.contract.StorageListContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.supply_chain.mvp.ui.fragment.StorageListFragment; import com.gingersoft.supply_chain.mvp.ui.fragment.inventory.StorageListFragment;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/di/component/SupplierListComponent.java
...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component; ...@@ -3,13 +3,13 @@ package com.gingersoft.supply_chain.di.component;
import dagger.BindsInstance; import dagger.BindsInstance;
import dagger.Component; import dagger.Component;
import com.gingersoft.supply_chain.mvp.ui.fragment.supplier.SupplierListFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.gingersoft.supply_chain.di.module.SupplierListModule; import com.gingersoft.supply_chain.di.module.SupplierListModule;
import com.gingersoft.supply_chain.mvp.contract.SupplierListContract; import com.gingersoft.supply_chain.mvp.contract.SupplierListContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.supply_chain.mvp.ui.fragment.SupplierListFragment;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/presenter/NewFoodIngredientsPresenter.java
...@@ -18,9 +18,9 @@ import com.gingersoft.supply_chain.mvp.bean.FoodPackingSpecificationBean; ...@@ -18,9 +18,9 @@ import com.gingersoft.supply_chain.mvp.bean.FoodPackingSpecificationBean;
import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodListVosBean; import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodListVosBean;
import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean; import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean;
import com.gingersoft.supply_chain.mvp.contract.NewFoodIngredientsContract; import com.gingersoft.supply_chain.mvp.contract.NewFoodIngredientsContract;
import com.gingersoft.supply_chain.mvp.ui.fragment.CategorySelectFragment; import com.gingersoft.supply_chain.mvp.ui.fragment.category.CategorySelectFragment;
import com.gingersoft.supply_chain.mvp.ui.fragment.PackageSpecificationFragment; import com.gingersoft.supply_chain.mvp.ui.fragment.food.PackageSpecificationFragment;
import com.gingersoft.supply_chain.mvp.ui.fragment.SupplierListFragment; import com.gingersoft.supply_chain.mvp.ui.fragment.supplier.SupplierListFragment;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.http.imageloader.ImageLoader; import com.jess.arms.http.imageloader.ImageLoader;
import com.jess.arms.integration.AppManager; import com.jess.arms.integration.AppManager;
...@@ -42,9 +42,9 @@ import okhttp3.MediaType; ...@@ -42,9 +42,9 @@ import okhttp3.MediaType;
import okhttp3.MultipartBody; import okhttp3.MultipartBody;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import static com.gingersoft.supply_chain.mvp.ui.fragment.CategorySelectFragment.SELECT_FOOD_CATEGORY_REQUEST_CODE; import static com.gingersoft.supply_chain.mvp.ui.fragment.category.CategorySelectFragment.SELECT_FOOD_CATEGORY_REQUEST_CODE;
import static com.gingersoft.supply_chain.mvp.ui.fragment.PackageSpecificationFragment.SELECT_PACKAGE_SPECIFICATION_REQUEST_CODE; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.PackageSpecificationFragment.SELECT_PACKAGE_SPECIFICATION_REQUEST_CODE;
import static com.gingersoft.supply_chain.mvp.ui.fragment.SupplierListFragment.SELECT_SUPPLIER_RESULTCODE; import static com.gingersoft.supply_chain.mvp.ui.fragment.supplier.SupplierListFragment.SELECT_SUPPLIER_RESULTCODE;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/presenter/PackageSpecificationPresenter.java
...@@ -9,7 +9,7 @@ import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean; ...@@ -9,7 +9,7 @@ import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean;
import com.gingersoft.supply_chain.mvp.bean.FoodPackingSpecificationBean; import com.gingersoft.supply_chain.mvp.bean.FoodPackingSpecificationBean;
import com.gingersoft.supply_chain.mvp.bean.MeasurementUnitBean; import com.gingersoft.supply_chain.mvp.bean.MeasurementUnitBean;
import com.gingersoft.supply_chain.mvp.contract.PackageSpecificationContract; import com.gingersoft.supply_chain.mvp.contract.PackageSpecificationContract;
import com.gingersoft.supply_chain.mvp.ui.fragment.MeasurementUnitFragment; import com.gingersoft.supply_chain.mvp.ui.fragment.food.MeasurementUnitFragment;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.http.imageloader.ImageLoader; import com.jess.arms.http.imageloader.ImageLoader;
import com.jess.arms.integration.AppManager; import com.jess.arms.integration.AppManager;
...@@ -22,8 +22,8 @@ import javax.inject.Inject; ...@@ -22,8 +22,8 @@ import javax.inject.Inject;
import me.jessyan.rxerrorhandler.core.RxErrorHandler; import me.jessyan.rxerrorhandler.core.RxErrorHandler;
import static com.gingersoft.supply_chain.mvp.ui.fragment.PackageSpecificationFragment.OrderingUnitRequestCode; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.PackageSpecificationFragment.OrderingUnitRequestCode;
import static com.gingersoft.supply_chain.mvp.ui.fragment.PackageSpecificationFragment.ReceivingUnitRequestCode; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.PackageSpecificationFragment.ReceivingUnitRequestCode;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/adapter/FoodListAdapter.java
...@@ -22,8 +22,8 @@ import java.util.HashMap; ...@@ -22,8 +22,8 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static com.gingersoft.supply_chain.mvp.ui.fragment.FoodIngredientsFragment.ADD_ORDER; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.FoodIngredientsFragment.ADD_ORDER;
import static com.gingersoft.supply_chain.mvp.ui.fragment.FoodIngredientsFragment.FOOD_INGREDIENTS; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.FoodIngredientsFragment.FOOD_INGREDIENTS;
/** /**
* @author 宇航. * @author 宇航.
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/FunctionListFragment.java
...@@ -18,13 +18,19 @@ import com.gingersoft.supply_chain.mvp.contract.FunctionListContract; ...@@ -18,13 +18,19 @@ import com.gingersoft.supply_chain.mvp.contract.FunctionListContract;
import com.gingersoft.supply_chain.mvp.presenter.FunctionListPresenter; import com.gingersoft.supply_chain.mvp.presenter.FunctionListPresenter;
import com.gingersoft.supply_chain.mvp.ui.adapter.FunctionChildAdapter; import com.gingersoft.supply_chain.mvp.ui.adapter.FunctionChildAdapter;
import com.gingersoft.supply_chain.mvp.ui.adapter.PurchaseFunctionAdapter; import com.gingersoft.supply_chain.mvp.ui.adapter.PurchaseFunctionAdapter;
import com.gingersoft.supply_chain.mvp.ui.fragment.category.CategoryFragment;
import com.gingersoft.supply_chain.mvp.ui.fragment.inventory.StorageListFragment;
import com.gingersoft.supply_chain.mvp.ui.fragment.order.PurchaseListFragment;
import com.gingersoft.supply_chain.mvp.ui.fragment.food.MeasurementUnitFragment;
import com.gingersoft.supply_chain.mvp.ui.fragment.supplier.SupplierListFragment;
import com.gingersoft.supply_chain.mvp.ui.fragment.food.FoodIngredientsFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.qmuiteam.qmui.widget.QMUITopBar; import com.qmuiteam.qmui.widget.QMUITopBar;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import butterknife.BindView; import butterknife.BindView;
import static com.gingersoft.supply_chain.mvp.ui.fragment.FoodIngredientsFragment.FOOD_INGREDIENTS; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.FoodIngredientsFragment.FOOD_INGREDIENTS;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/CategoryFragment.java → supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/category/CategoryFragment.java
package com.gingersoft.supply_chain.mvp.ui.fragment; package com.gingersoft.supply_chain.mvp.ui.fragment.category;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
...@@ -29,6 +29,7 @@ import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean; ...@@ -29,6 +29,7 @@ import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean;
import com.gingersoft.supply_chain.mvp.contract.CategoryContract; import com.gingersoft.supply_chain.mvp.contract.CategoryContract;
import com.gingersoft.supply_chain.mvp.presenter.CategoryPresenter; import com.gingersoft.supply_chain.mvp.presenter.CategoryPresenter;
import com.gingersoft.supply_chain.mvp.ui.adapter.SecondCategoryAdapter; import com.gingersoft.supply_chain.mvp.ui.adapter.SecondCategoryAdapter;
import com.gingersoft.supply_chain.mvp.ui.fragment.BaseSupplyChainFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.qmuiteam.qmui.alpha.QMUIAlphaButton; import com.qmuiteam.qmui.alpha.QMUIAlphaButton;
import com.qmuiteam.qmui.alpha.QMUIAlphaTextView; import com.qmuiteam.qmui.alpha.QMUIAlphaTextView;
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/CategorySelectFragment.java → supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/category/CategorySelectFragment.java
package com.gingersoft.supply_chain.mvp.ui.fragment; package com.gingersoft.supply_chain.mvp.ui.fragment.category;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -18,6 +18,7 @@ import com.gingersoft.supply_chain.R2; ...@@ -18,6 +18,7 @@ import com.gingersoft.supply_chain.R2;
import com.gingersoft.supply_chain.di.component.DaggerCategorySelectComponent; import com.gingersoft.supply_chain.di.component.DaggerCategorySelectComponent;
import com.gingersoft.supply_chain.mvp.contract.CategorySelectContract; import com.gingersoft.supply_chain.mvp.contract.CategorySelectContract;
import com.gingersoft.supply_chain.mvp.presenter.CategorySelectPresenter; import com.gingersoft.supply_chain.mvp.presenter.CategorySelectPresenter;
import com.gingersoft.supply_chain.mvp.ui.fragment.BaseSupplyChainFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.qmuiteam.qmui.widget.QMUITopBar; import com.qmuiteam.qmui.widget.QMUITopBar;
import com.qmuiteam.qmui.widget.section.QMUISection; import com.qmuiteam.qmui.widget.section.QMUISection;
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/FoodIngredientCategoryFragment.java → supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/food/FoodIngredientCategoryFragment.java
package com.gingersoft.supply_chain.mvp.ui.fragment; package com.gingersoft.supply_chain.mvp.ui.fragment.food;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -12,6 +12,7 @@ import com.gingersoft.supply_chain.R; ...@@ -12,6 +12,7 @@ import com.gingersoft.supply_chain.R;
import com.gingersoft.supply_chain.di.component.DaggerFoodIngredientCategoryComponent; import com.gingersoft.supply_chain.di.component.DaggerFoodIngredientCategoryComponent;
import com.gingersoft.supply_chain.mvp.contract.FoodIngredientCategoryContract; import com.gingersoft.supply_chain.mvp.contract.FoodIngredientCategoryContract;
import com.gingersoft.supply_chain.mvp.presenter.FoodIngredientCategoryPresenter; import com.gingersoft.supply_chain.mvp.presenter.FoodIngredientCategoryPresenter;
import com.gingersoft.supply_chain.mvp.ui.fragment.BaseSupplyChainFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/FoodIngredientsFragment.java → supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/food/FoodIngredientsFragment.java
package com.gingersoft.supply_chain.mvp.ui.fragment; package com.gingersoft.supply_chain.mvp.ui.fragment.food;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -28,6 +28,8 @@ import com.gingersoft.supply_chain.mvp.contract.FoodIngredientsContract; ...@@ -28,6 +28,8 @@ import com.gingersoft.supply_chain.mvp.contract.FoodIngredientsContract;
import com.gingersoft.supply_chain.mvp.presenter.FoodIngredientsPresenter; import com.gingersoft.supply_chain.mvp.presenter.FoodIngredientsPresenter;
import com.gingersoft.supply_chain.mvp.ui.adapter.FoodListAdapter; import com.gingersoft.supply_chain.mvp.ui.adapter.FoodListAdapter;
import com.gingersoft.supply_chain.mvp.ui.adapter.OrderCategoryAdapter; import com.gingersoft.supply_chain.mvp.ui.adapter.OrderCategoryAdapter;
import com.gingersoft.supply_chain.mvp.ui.fragment.BaseSupplyChainFragment;
import com.gingersoft.supply_chain.mvp.ui.fragment.order.OrderContentFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.kingja.loadsir.callback.Callback; import com.kingja.loadsir.callback.Callback;
import com.kingja.loadsir.core.LoadSir; import com.kingja.loadsir.core.LoadSir;
...@@ -40,8 +42,7 @@ import java.util.Map; ...@@ -40,8 +42,7 @@ import java.util.Map;
import butterknife.BindView; import butterknife.BindView;
import butterknife.OnClick; import butterknife.OnClick;
import static com.gingersoft.supply_chain.mvp.ui.fragment.NewFoodIngredientsFragment.EDIT_FOOD_RESULT_CODE; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.NewFoodIngredientsFragment.EDIT_FOOD_RESULT_CODE;
/** /**
* ================================================ * ================================================
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/MeasurementUnitFragment.java → supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/food/MeasurementUnitFragment.java
package com.gingersoft.supply_chain.mvp.ui.fragment; package com.gingersoft.supply_chain.mvp.ui.fragment.food;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -20,6 +20,7 @@ import com.gingersoft.supply_chain.mvp.bean.MeasurementUnitBean; ...@@ -20,6 +20,7 @@ import com.gingersoft.supply_chain.mvp.bean.MeasurementUnitBean;
import com.gingersoft.supply_chain.mvp.contract.MeasurementUnitContract; import com.gingersoft.supply_chain.mvp.contract.MeasurementUnitContract;
import com.gingersoft.supply_chain.mvp.presenter.MeasurementUnitPresenter; import com.gingersoft.supply_chain.mvp.presenter.MeasurementUnitPresenter;
import com.gingersoft.supply_chain.mvp.ui.adapter.MeasurementUnitAdapter; import com.gingersoft.supply_chain.mvp.ui.adapter.MeasurementUnitAdapter;
import com.gingersoft.supply_chain.mvp.ui.fragment.BaseSupplyChainFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.kingja.loadsir.callback.Callback; import com.kingja.loadsir.callback.Callback;
import com.kingja.loadsir.core.LoadSir; import com.kingja.loadsir.core.LoadSir;
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/NewFoodIngredientsFragment.java → supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/food/NewFoodIngredientsFragment.java
package com.gingersoft.supply_chain.mvp.ui.fragment; package com.gingersoft.supply_chain.mvp.ui.fragment.food;
import android.Manifest; import android.Manifest;
import android.content.Intent; import android.content.Intent;
...@@ -30,6 +30,7 @@ import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodListVosBean; ...@@ -30,6 +30,7 @@ import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodListVosBean;
import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean; import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean;
import com.gingersoft.supply_chain.mvp.contract.NewFoodIngredientsContract; import com.gingersoft.supply_chain.mvp.contract.NewFoodIngredientsContract;
import com.gingersoft.supply_chain.mvp.presenter.NewFoodIngredientsPresenter; import com.gingersoft.supply_chain.mvp.presenter.NewFoodIngredientsPresenter;
import com.gingersoft.supply_chain.mvp.ui.fragment.BaseSupplyChainFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.permissionx.guolindev.PermissionX; import com.permissionx.guolindev.PermissionX;
import com.qmuiteam.qmui.alpha.QMUIAlphaButton; import com.qmuiteam.qmui.alpha.QMUIAlphaButton;
...@@ -42,13 +43,13 @@ import butterknife.OnClick; ...@@ -42,13 +43,13 @@ import butterknife.OnClick;
import static com.gingersoft.gsa.cloud.common.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST; import static com.gingersoft.gsa.cloud.common.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST;
import static com.gingersoft.gsa.cloud.ui.adapter.multi.MultiUploadPicProvider.CHOOSE_PHOTO; import static com.gingersoft.gsa.cloud.ui.adapter.multi.MultiUploadPicProvider.CHOOSE_PHOTO;
import static com.gingersoft.supply_chain.mvp.ui.fragment.CategorySelectFragment.SELECT_CATEGORY_DATA_KEY; import static com.gingersoft.supply_chain.mvp.ui.fragment.category.CategorySelectFragment.SELECT_CATEGORY_DATA_KEY;
import static com.gingersoft.supply_chain.mvp.ui.fragment.CategorySelectFragment.SELECT_FOOD_CATEGORY_REQUEST_CODE; import static com.gingersoft.supply_chain.mvp.ui.fragment.category.CategorySelectFragment.SELECT_FOOD_CATEGORY_REQUEST_CODE;
import static com.gingersoft.supply_chain.mvp.ui.fragment.PackageSpecificationFragment.FOOD_PACKING_SPECIFICATION_DATA_KEY; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.PackageSpecificationFragment.FOOD_PACKING_SPECIFICATION_DATA_KEY;
import static com.gingersoft.supply_chain.mvp.ui.fragment.PackageSpecificationFragment.SELECT_PACKAGE_SPECIFICATION_REQUEST_CODE; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.PackageSpecificationFragment.SELECT_PACKAGE_SPECIFICATION_REQUEST_CODE;
import static com.gingersoft.supply_chain.mvp.ui.fragment.PackageSpecificationFragment.SELECT_PACKAGE_SPECIFICATION_RESULT_CODE; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.PackageSpecificationFragment.SELECT_PACKAGE_SPECIFICATION_RESULT_CODE;
import static com.gingersoft.supply_chain.mvp.ui.fragment.SupplierListFragment.SELECT_SUPPLIER_DATA; import static com.gingersoft.supply_chain.mvp.ui.fragment.supplier.SupplierListFragment.SELECT_SUPPLIER_DATA;
import static com.gingersoft.supply_chain.mvp.ui.fragment.SupplierListFragment.SELECT_SUPPLIER_RESULTCODE; import static com.gingersoft.supply_chain.mvp.ui.fragment.supplier.SupplierListFragment.SELECT_SUPPLIER_RESULTCODE;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/NewFoodUnitFragment.java → supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/food/NewFoodUnitFragment.java
package com.gingersoft.supply_chain.mvp.ui.fragment; package com.gingersoft.supply_chain.mvp.ui.fragment.food;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -19,6 +19,7 @@ import com.gingersoft.supply_chain.di.component.DaggerNewFoodUnitComponent; ...@@ -19,6 +19,7 @@ import com.gingersoft.supply_chain.di.component.DaggerNewFoodUnitComponent;
import com.gingersoft.supply_chain.mvp.bean.MeasurementUnitBean; import com.gingersoft.supply_chain.mvp.bean.MeasurementUnitBean;
import com.gingersoft.supply_chain.mvp.contract.NewFoodUnitContract; import com.gingersoft.supply_chain.mvp.contract.NewFoodUnitContract;
import com.gingersoft.supply_chain.mvp.presenter.NewFoodUnitPresenter; import com.gingersoft.supply_chain.mvp.presenter.NewFoodUnitPresenter;
import com.gingersoft.supply_chain.mvp.ui.fragment.BaseSupplyChainFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.qmuiteam.qmui.alpha.QMUIAlphaButton; import com.qmuiteam.qmui.alpha.QMUIAlphaButton;
import com.qmuiteam.qmui.widget.QMUITopBar; import com.qmuiteam.qmui.widget.QMUITopBar;
...@@ -30,7 +31,7 @@ import butterknife.BindView; ...@@ -30,7 +31,7 @@ import butterknife.BindView;
import butterknife.OnClick; import butterknife.OnClick;
import static com.gingersoft.gsa.cloud.common.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST; import static com.gingersoft.gsa.cloud.common.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST;
import static com.gingersoft.supply_chain.mvp.ui.fragment.MeasurementUnitFragment.EDIT_FOOD_UNIT_REQUEST_CODE; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.MeasurementUnitFragment.EDIT_FOOD_UNIT_REQUEST_CODE;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/PackageSpecificationFragment.java → supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/food/PackageSpecificationFragment.java
package com.gingersoft.supply_chain.mvp.ui.fragment; package com.gingersoft.supply_chain.mvp.ui.fragment.food;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -22,6 +22,7 @@ import com.gingersoft.supply_chain.mvp.bean.FoodPackingSpecificationBean; ...@@ -22,6 +22,7 @@ import com.gingersoft.supply_chain.mvp.bean.FoodPackingSpecificationBean;
import com.gingersoft.supply_chain.mvp.bean.MeasurementUnitBean; import com.gingersoft.supply_chain.mvp.bean.MeasurementUnitBean;
import com.gingersoft.supply_chain.mvp.contract.PackageSpecificationContract; import com.gingersoft.supply_chain.mvp.contract.PackageSpecificationContract;
import com.gingersoft.supply_chain.mvp.presenter.PackageSpecificationPresenter; import com.gingersoft.supply_chain.mvp.presenter.PackageSpecificationPresenter;
import com.gingersoft.supply_chain.mvp.ui.fragment.BaseSupplyChainFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.qmuiteam.qmui.widget.QMUITopBar; import com.qmuiteam.qmui.widget.QMUITopBar;
...@@ -33,14 +34,13 @@ import butterknife.OnClick; ...@@ -33,14 +34,13 @@ import butterknife.OnClick;
import me.yokeyword.fragmentation.ISupportFragment; import me.yokeyword.fragmentation.ISupportFragment;
import static com.gingersoft.gsa.cloud.common.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST; import static com.gingersoft.gsa.cloud.common.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST;
import static com.gingersoft.supply_chain.mvp.ui.fragment.MeasurementUnitFragment.SELECT_FOOD_UNIT_REQUEST_CODE; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.MeasurementUnitFragment.SELECT_FOOD_UNIT_REQUEST_CODE;
import static com.gingersoft.supply_chain.mvp.ui.fragment.MeasurementUnitFragment.SELECT_FOOD_UNIT_RESULT_DATA; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.MeasurementUnitFragment.SELECT_FOOD_UNIT_RESULT_DATA;
/** /**
* ================================================ * ================================================
* Description: * Description:包裝規格 * <p>
* <p>
* Created by MVPArmsTemplate on 11/24/2020 18:40 * Created by MVPArmsTemplate on 11/24/2020 18:40
* <a href="mailto:jess.yan.effort@gmail.com">Contact me</a> * <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
* <a href="https://github.com/JessYanCoding">Follow me</a> * <a href="https://github.com/JessYanCoding">Follow me</a>
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/StorageListFragment.java → supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/inventory/StorageListFragment.java
package com.gingersoft.supply_chain.mvp.ui.fragment; package com.gingersoft.supply_chain.mvp.ui.fragment.inventory;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -20,6 +20,7 @@ import com.gingersoft.supply_chain.mvp.contract.StorageListContract; ...@@ -20,6 +20,7 @@ import com.gingersoft.supply_chain.mvp.contract.StorageListContract;
import com.gingersoft.supply_chain.mvp.presenter.StorageListPresenter; import com.gingersoft.supply_chain.mvp.presenter.StorageListPresenter;
import com.gingersoft.supply_chain.mvp.ui.adapter.PurchasePageAdapter; import com.gingersoft.supply_chain.mvp.ui.adapter.PurchasePageAdapter;
import com.gingersoft.supply_chain.mvp.ui.adapter.StorageAdapter; import com.gingersoft.supply_chain.mvp.ui.adapter.StorageAdapter;
import com.gingersoft.supply_chain.mvp.ui.fragment.BaseSupplyChainFragment;
import com.gingersoft.supply_chain.mvp.ui.widget.ScreenView; import com.gingersoft.supply_chain.mvp.ui.widget.ScreenView;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.qmuiteam.qmui.alpha.QMUIAlphaButton; import com.qmuiteam.qmui.alpha.QMUIAlphaButton;
...@@ -41,7 +42,7 @@ import butterknife.OnClick; ...@@ -41,7 +42,7 @@ import butterknife.OnClick;
/** /**
* ================================================ * ================================================
* Description: * Description: 入庫單列表
* <p> * <p>
* Created by MVPArmsTemplate on 12/10/2020 18:09 * Created by MVPArmsTemplate on 12/10/2020 18:09
* <a href="mailto:jess.yan.effort@gmail.com">Contact me</a> * <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/ConfirmOrderFragment.java → supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/order/ConfirmOrderFragment.java
package com.gingersoft.supply_chain.mvp.ui.fragment; package com.gingersoft.supply_chain.mvp.ui.fragment.order;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -16,6 +16,7 @@ import com.gingersoft.supply_chain.mvp.bean.ConfirmOrderBean; ...@@ -16,6 +16,7 @@ import com.gingersoft.supply_chain.mvp.bean.ConfirmOrderBean;
import com.gingersoft.supply_chain.mvp.contract.ConfirmOrderContract; import com.gingersoft.supply_chain.mvp.contract.ConfirmOrderContract;
import com.gingersoft.supply_chain.mvp.presenter.ConfirmOrderPresenter; import com.gingersoft.supply_chain.mvp.presenter.ConfirmOrderPresenter;
import com.gingersoft.supply_chain.mvp.ui.adapter.ConfirmOrderAdapter; import com.gingersoft.supply_chain.mvp.ui.adapter.ConfirmOrderAdapter;
import com.gingersoft.supply_chain.mvp.ui.fragment.BaseSupplyChainFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.qmuiteam.qmui.alpha.QMUIAlphaTextView; import com.qmuiteam.qmui.alpha.QMUIAlphaTextView;
import com.qmuiteam.qmui.widget.QMUITopBar; import com.qmuiteam.qmui.widget.QMUITopBar;
...@@ -28,8 +29,7 @@ import butterknife.OnClick; ...@@ -28,8 +29,7 @@ import butterknife.OnClick;
/** /**
* ================================================ * ================================================
* Description: * Description:確認訂單頁面 * <p>
* <p>
* Created by MVPArmsTemplate on 12/17/2020 10:24 * Created by MVPArmsTemplate on 12/17/2020 10:24
* <a href="mailto:jess.yan.effort@gmail.com">Contact me</a> * <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
* <a href="https://github.com/JessYanCoding">Follow me</a> * <a href="https://github.com/JessYanCoding">Follow me</a>
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/OrderContentFragment.java → supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/order/OrderContentFragment.java
package com.gingersoft.supply_chain.mvp.ui.fragment; package com.gingersoft.supply_chain.mvp.ui.fragment.order;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -21,6 +21,8 @@ import com.gingersoft.supply_chain.mvp.content.SupplyShoppingCart; ...@@ -21,6 +21,8 @@ import com.gingersoft.supply_chain.mvp.content.SupplyShoppingCart;
import com.gingersoft.supply_chain.mvp.contract.OrderContentContract; import com.gingersoft.supply_chain.mvp.contract.OrderContentContract;
import com.gingersoft.supply_chain.mvp.presenter.OrderContentPresenter; import com.gingersoft.supply_chain.mvp.presenter.OrderContentPresenter;
import com.gingersoft.supply_chain.mvp.ui.adapter.ShoppingCartAdapter; import com.gingersoft.supply_chain.mvp.ui.adapter.ShoppingCartAdapter;
import com.gingersoft.supply_chain.mvp.ui.fragment.BaseSupplyChainFragment;
import com.gingersoft.supply_chain.mvp.ui.fragment.food.FoodIngredientsFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.qmuiteam.qmui.widget.QMUITopBar; import com.qmuiteam.qmui.widget.QMUITopBar;
...@@ -29,7 +31,7 @@ import java.util.List; ...@@ -29,7 +31,7 @@ import java.util.List;
import butterknife.BindView; import butterknife.BindView;
import butterknife.OnClick; import butterknife.OnClick;
import static com.gingersoft.supply_chain.mvp.ui.fragment.FoodIngredientsFragment.ADD_ORDER; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.FoodIngredientsFragment.ADD_ORDER;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/PurchaseListFragment.java → supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/order/PurchaseListFragment.java
package com.gingersoft.supply_chain.mvp.ui.fragment; package com.gingersoft.supply_chain.mvp.ui.fragment.order;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -22,6 +22,8 @@ import com.gingersoft.supply_chain.mvp.contract.PurchaseListContract; ...@@ -22,6 +22,8 @@ import com.gingersoft.supply_chain.mvp.contract.PurchaseListContract;
import com.gingersoft.supply_chain.mvp.presenter.PurchaseListPresenter; import com.gingersoft.supply_chain.mvp.presenter.PurchaseListPresenter;
import com.gingersoft.supply_chain.mvp.ui.adapter.PurchaseOrderAdapter; import com.gingersoft.supply_chain.mvp.ui.adapter.PurchaseOrderAdapter;
import com.gingersoft.supply_chain.mvp.ui.adapter.PurchasePageAdapter; import com.gingersoft.supply_chain.mvp.ui.adapter.PurchasePageAdapter;
import com.gingersoft.supply_chain.mvp.ui.fragment.BaseSupplyChainFragment;
import com.gingersoft.supply_chain.mvp.ui.fragment.food.FoodIngredientsFragment;
import com.gingersoft.supply_chain.mvp.ui.widget.ScreenView; import com.gingersoft.supply_chain.mvp.ui.widget.ScreenView;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.qmuiteam.qmui.alpha.QMUIAlphaButton; import com.qmuiteam.qmui.alpha.QMUIAlphaButton;
...@@ -38,11 +40,11 @@ import java.util.List; ...@@ -38,11 +40,11 @@ import java.util.List;
import butterknife.BindView; import butterknife.BindView;
import butterknife.OnClick; import butterknife.OnClick;
import static com.gingersoft.supply_chain.mvp.ui.fragment.FoodIngredientsFragment.ADD_ORDER; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.FoodIngredientsFragment.ADD_ORDER;
/** /**
* Description:採購列表 * Description:採購單列表
*/ */
public class PurchaseListFragment extends BaseSupplyChainFragment<PurchaseListPresenter> implements PurchaseListContract.View, View.OnClickListener { public class PurchaseListFragment extends BaseSupplyChainFragment<PurchaseListPresenter> implements PurchaseListContract.View, View.OnClickListener {
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/SendMsgFragment.java → supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/order/SendMsgFragment.java
package com.gingersoft.supply_chain.mvp.ui.fragment; package com.gingersoft.supply_chain.mvp.ui.fragment.order;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -22,6 +22,7 @@ import com.gingersoft.supply_chain.di.component.DaggerSendMsgComponent; ...@@ -22,6 +22,7 @@ import com.gingersoft.supply_chain.di.component.DaggerSendMsgComponent;
import com.gingersoft.supply_chain.mvp.bean.ConfirmOrderBean; import com.gingersoft.supply_chain.mvp.bean.ConfirmOrderBean;
import com.gingersoft.supply_chain.mvp.contract.SendMsgContract; import com.gingersoft.supply_chain.mvp.contract.SendMsgContract;
import com.gingersoft.supply_chain.mvp.presenter.SendMsgPresenter; import com.gingersoft.supply_chain.mvp.presenter.SendMsgPresenter;
import com.gingersoft.supply_chain.mvp.ui.fragment.BaseSupplyChainFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.DeviceUtils; import com.jess.arms.utils.DeviceUtils;
import com.qmuiteam.qmui.alpha.QMUIAlphaButton; import com.qmuiteam.qmui.alpha.QMUIAlphaButton;
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/NewSupplierFragment.java → supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/supplier/NewSupplierFragment.java
package com.gingersoft.supply_chain.mvp.ui.fragment; package com.gingersoft.supply_chain.mvp.ui.fragment.supplier;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -18,6 +18,7 @@ import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean; ...@@ -18,6 +18,7 @@ import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean;
import com.gingersoft.supply_chain.mvp.content.Constant; import com.gingersoft.supply_chain.mvp.content.Constant;
import com.gingersoft.supply_chain.mvp.contract.NewSupplierContract; import com.gingersoft.supply_chain.mvp.contract.NewSupplierContract;
import com.gingersoft.supply_chain.mvp.presenter.NewSupplierPresenter; import com.gingersoft.supply_chain.mvp.presenter.NewSupplierPresenter;
import com.gingersoft.supply_chain.mvp.ui.fragment.BaseSupplyChainFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.qmuiteam.qmui.alpha.QMUIAlphaButton; import com.qmuiteam.qmui.alpha.QMUIAlphaButton;
import com.qmuiteam.qmui.widget.QMUITopBar; import com.qmuiteam.qmui.widget.QMUITopBar;
...@@ -26,7 +27,7 @@ import butterknife.BindView; ...@@ -26,7 +27,7 @@ import butterknife.BindView;
import butterknife.OnClick; import butterknife.OnClick;
import static com.gingersoft.gsa.cloud.common.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST; import static com.gingersoft.gsa.cloud.common.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST;
import static com.gingersoft.supply_chain.mvp.ui.fragment.SupplierListFragment.SUPPLIER_LIST; import static com.gingersoft.supply_chain.mvp.ui.fragment.supplier.SupplierListFragment.SUPPLIER_LIST;
/** /**
......
supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/SupplierListFragment.java → supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/supplier/SupplierListFragment.java
package com.gingersoft.supply_chain.mvp.ui.fragment; package com.gingersoft.supply_chain.mvp.ui.fragment.supplier;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -20,6 +20,7 @@ import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean; ...@@ -20,6 +20,7 @@ import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean;
import com.gingersoft.supply_chain.mvp.contract.SupplierListContract; import com.gingersoft.supply_chain.mvp.contract.SupplierListContract;
import com.gingersoft.supply_chain.mvp.presenter.SupplierListPresenter; import com.gingersoft.supply_chain.mvp.presenter.SupplierListPresenter;
import com.gingersoft.supply_chain.mvp.ui.adapter.SupplierAdapter; import com.gingersoft.supply_chain.mvp.ui.adapter.SupplierAdapter;
import com.gingersoft.supply_chain.mvp.ui.fragment.BaseSupplyChainFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.kingja.loadsir.callback.Callback; import com.kingja.loadsir.callback.Callback;
import com.kingja.loadsir.core.LoadSir; import com.kingja.loadsir.core.LoadSir;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment