提交 12b23bde authored 作者: flexiblexd@163.com's avatar flexiblexd@163.com

1.修改bug

上级 731cbfc7
......@@ -6,17 +6,19 @@ android {
applicationId "com.wd.workoffice"
minSdkVersion 21
targetSdkVersion 28
versionCode 5
versionName "1.0.5"
versionCode 8
versionName "1.0.8"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
manifestPlaceholders = [
JPUSH_PKGNAME: applicationId,
JPUSH_APPKEY : "376831354e7055c58a957394", //JPush上注册的包名对应的appkey.1e9761959c929c9c0302f414
JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可.
]
}
lintOptions {
checkReleaseBuilds false
abortOnError false
}
buildTypes {
release {
minifyEnabled false
......
......@@ -44,7 +44,7 @@ public interface ApiService {
*
* @return
*/
@POST("/open/sys/user/register")
@POST("open/sys/user/register")
Observable<BaseBean> register(@Body RequestBody requestBody);
/**
......@@ -54,13 +54,13 @@ public interface ApiService {
*
* @return
*/
@POST("/login")
@POST("login")
Call<BaseBean> login(@Query("grant_type") String type, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/oauth/token?grant_type=refresh_token")
@POST("oauth/token?grant_type=refresh_token")
Call<JSONObject> refreshToken(@QueryMap Map<String, Object> param);
/**
......@@ -68,7 +68,7 @@ public interface ApiService {
*
* @return
*/
@POST("/authorities/logout")
@POST("authorities/logout")
Observable<BaseBean> logout();
/**
......@@ -76,7 +76,7 @@ public interface ApiService {
*
* @return
*/
@GET("/open/pre-activation/{phone}")
@GET("open/pre-activation/{phone}")
Observable<BaseBean> preActivationUser(@Path("phone") String phone);
......@@ -85,7 +85,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/open/change-pwd-forget")
@PUT("open/change-pwd-forget")
Observable<BaseBean> forgetPwd(@Query("phone") String phone,
@Query("verifyCode") String verifyCode, @Query("newPassword") String newPassword);
......@@ -94,7 +94,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/sys/user/change-pwd")
@PUT("sys/user/change-pwd")
Observable<BaseBean> modifyPwd(@Query("oldPassword") String oldPassword,
@Query("newPassword") String newPassword);
......@@ -105,7 +105,7 @@ public interface ApiService {
* @param type: login、register、alterPwd
* @return
*/
@GET("/open/sms/ckCode/{phone}")
@GET("open/sms/ckCode/{phone}")
Observable<BaseBean> code(@Path("phone") String phone, @Query("type") String type);
/**
......@@ -114,7 +114,7 @@ public interface ApiService {
* @param phone
* @return
*/
@GET("/open/verify-sms-code")
@GET("open/verify-sms-code")
Observable<BaseBean> verifyCode(@Query("phone") String phone,
@Query("verifyCode") String verifyCode, @Query("type") String type);
......@@ -123,7 +123,7 @@ public interface ApiService {
*
* @return
*/
@GET("/open/pre-activation/{phone}")
@GET("open/pre-activation/{phone}")
Observable<BaseBean> getInfo(@Path("phone") String phone);
/**
......@@ -131,7 +131,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/open/activation-user")
@PUT("open/activation-user")
Observable<BaseBean> activation(@Body RequestBody requestBody);
......@@ -140,7 +140,7 @@ public interface ApiService {
*
* @return
*/
@GET("/open/sys/dept/list")
@GET("open/sys/dept/list")
Observable<BaseBean> depList();
/**
......@@ -148,7 +148,7 @@ public interface ApiService {
*
* @return
*/
@POST("/sys/dept")
@POST("sys/dept")
Observable<BaseBean> addDep(@Body RequestBody requestBody);
/**
......@@ -156,7 +156,7 @@ public interface ApiService {
*
* @return
*/
@GET("/sub-process/dept-list")
@GET("sub-process/dept-list")
Observable<BaseBean> getDepByPermission(@Query("permission") String permission);
/**
......@@ -166,7 +166,7 @@ public interface ApiService {
* @param transitPartId 往来单位id(客戶id)
* @return
*/
@GET("/sub-process/listByDPT")
@GET("sub-process/listByDPT")
Observable<BaseBean> getProcess(@Query("processCode") String processCode, @Query("transitPartId") Integer transitPartId);
/**
......@@ -179,7 +179,7 @@ public interface ApiService {
*
* @return
*/
@GET("/transitpart/page/list/current-user/part-type")
@GET("transitpart/page/list/current-user/part-type")
Observable<BaseBean> getClient(@QueryMap Map<String, Object> param);
/**
......@@ -192,7 +192,7 @@ public interface ApiService {
*
* @return
*/
@GET("/transitpart/search-list")
@GET("transitpart/search-list")
Observable<BaseBean> getClientOut(@QueryMap Map<String, Object> param);
/**
......@@ -220,7 +220,7 @@ public interface ApiService {
*
* @return
*/
@GET("/stock/search-list")
@GET("stock/search-list")
Observable<BaseBean> getStock(@QueryMap Map<String, Object> param);
......@@ -229,7 +229,7 @@ public interface ApiService {
*
* @return
*/
@GET("/biz-approval/count")
@GET("biz-approval/count")
Observable<BaseBean> approvalCount();
/**
......@@ -237,7 +237,7 @@ public interface ApiService {
*
* @return
*/
@GET("/sys/user/userInfo")
@GET("sys/user/userInfo")
Observable<BaseBean> userInfo();
/**
......@@ -254,7 +254,7 @@ public interface ApiService {
*
* @return
*/
@GET("/saleOrder/current-user/page/list")
@GET("saleOrder/current-user/page/list")
Observable<BaseBean> getOrder(@QueryMap Map<String, Object> param);
/**
......@@ -271,7 +271,7 @@ public interface ApiService {
*
* @return
*/
@GET("/purchaseOrder/current-user/page/list")
@GET("purchaseOrder/current-user/page/list")
Observable<BaseBean> getOutOrder(@QueryMap Map<String, Object> param);
/**
......@@ -288,7 +288,7 @@ public interface ApiService {
*
* @return
*/
@GET("/insideOrder/current-user/page/list")
@GET("insideOrder/current-user/page/list")
Observable<BaseBean> getInsideOrder(@QueryMap Map<String, Object> param);
/**
......@@ -304,7 +304,7 @@ public interface ApiService {
*
* @return
*/
@GET("/supplierOrder/current-user/page/list")
@GET("supplierOrder/current-user/page/list")
Observable<BaseBean> getSupplierOrder(@QueryMap Map<String, Object> param);
/**
......@@ -321,7 +321,7 @@ public interface ApiService {
*
* @return
*/
@GET("/crucibleOrder/current-user/page/list")
@GET("crucibleOrder/current-user/page/list")
Observable<BaseBean> getCucibleOrder(@QueryMap Map<String, Object> param);
/**
......@@ -338,7 +338,7 @@ public interface ApiService {
*
* @return
*/
@GET("/crucibleSaleOrder/current-user/page/list")
@GET("crucibleSaleOrder/current-user/page/list")
Observable<BaseBean> getCucibleSaleOrder(@QueryMap Map<String, Object> param);
......@@ -353,7 +353,7 @@ public interface ApiService {
*
* @return
*/
@GET("/product/app/page/list")
@GET("product/app/page/list")
Observable<BaseBean> getPro(@QueryMap Map<String, Object> param);
/**
......@@ -371,7 +371,7 @@ public interface ApiService {
*
* @return
*/
@GET("/product/app/detail/{productId}")
@GET("product/app/detail/{productId}")
Observable<ProDetail> getProDetail(@Path("productId") String id);
/**
......@@ -382,7 +382,7 @@ public interface ApiService {
*
* @return
*/
@GET("/product-price-change/page/list")
@GET("product-price-change/page/list")
Observable<BaseBean> getProHistoryPrice(@QueryMap Map<String, Object> param);
/**
......@@ -393,7 +393,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/product/price")
@PUT("product/price")
Observable<BaseBean> modifyProPrice(@Body RequestBody requestBody);
......@@ -404,7 +404,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/product/app/shelf")
@PUT("product/app/shelf")
// Observable<BaseBean> onSalePro(@Body RequestBody requestBody);
Observable<BaseBean> onSalePro(@QueryMap Map<String, Object> param);
......@@ -443,10 +443,10 @@ public interface ApiService {
*
* @return
*/
@POST("/crucibleOrder/start")
@POST("crucibleOrder/start")
Observable<BaseBean> submitCrucibleOrder(@Body RequestBody requestBody);
@POST("/crucibleSaleOrder")
@POST("crucibleSaleOrder")
Observable<BaseBean> submitCrucibleSaleOrder(@Body RequestBody requestBody);
/**
......@@ -464,7 +464,7 @@ public interface ApiService {
*
* @return
*/
@POST("/supplierOrder/start")
@POST("supplierOrder/start")
Observable<BaseBean> submitSupplierOrder(@Body RequestBody requestBody);
/**
......@@ -486,7 +486,7 @@ public interface ApiService {
*
* @return
*/
@POST("/insideOrder/start")
@POST("insideOrder/start")
Observable<BaseBean> submitInsideOrder(@Body RequestBody requestBody);
/**
......@@ -508,10 +508,10 @@ public interface ApiService {
*
* @return
*/
@POST("/purchaseOrder/start")
@POST("purchaseOrder/start")
Observable<BaseBean> submitPurchaseOrder(@Body RequestBody requestBody);
@POST("/procedureStart/ao/applyPackage")
@POST("procedureStart/ao/applyPackage")
Observable<BaseBean> submitProcedureOrder(@Body RequestBody requestBody);
/**
......@@ -520,7 +520,7 @@ public interface ApiService {
* @param param
* @return
*/
@GET("/customer-branch-factory/page/init")
@GET("customer-branch-factory/page/init")
Observable<BaseBean> getClientFactory(@QueryMap Map<String, Object> param);
/**
......@@ -528,7 +528,7 @@ public interface ApiService {
*
* @return
*/
@GET("/bil-spc/list")
@GET("bil-spc/list")
Observable<BaseBean> getBill();
/**
......@@ -537,7 +537,7 @@ public interface ApiService {
* @param param
* @return
*/
@GET("/transitpart/app/page/list")
@GET("transitpart/app/page/list")
Observable<BaseBean> getContacts(@QueryMap Map<String, Object> param);
/**
......@@ -545,7 +545,7 @@ public interface ApiService {
*
* @return
*/
@GET("/dept-account-balance/app/account-balance-info")
@GET("dept-account-balance/app/account-balance-info")
Observable<BaseBean> getAccount();
/**
......@@ -554,7 +554,7 @@ public interface ApiService {
* @param param
* @return
*/
@GET("/finance/flow/page/list")
@GET("finance/flow/page/list")
Observable<BaseBean> getFlow(@QueryMap Map<String, Object> param);
/**
......@@ -568,7 +568,7 @@ public interface ApiService {
* searchValue 模糊搜索的关键字
* @return
*/
@GET("/stock/page/list")
@GET("stock/page/list")
Observable<BaseBean> getWarehouse(@QueryMap Map<String, Object> param);
/**
......@@ -582,7 +582,7 @@ public interface ApiService {
* searchValue 模糊搜索的关键字
* @return
*/
@GET("/stockQuantity/app/page/listOfOrder")
@GET("stockQuantity/app/page/listOfOrder")
Observable<BaseBean> getWareHouseOrder(@QueryMap Map<String, Object> param);
/**
......@@ -593,7 +593,7 @@ public interface ApiService {
* name
* @return
*/
@GET("/sys/dept/list")
@GET("sys/dept/list")
Observable<BaseBean> getDep(@QueryMap Map<String, Object> param);
/**
......@@ -602,7 +602,7 @@ public interface ApiService {
* @param id
* @return
*/
@GET("/sys/dept/{deptId}")
@GET("sys/dept/{deptId}")
Observable<BaseBean> getDepDetail(@Path("deptId") String id);
/**
......@@ -610,7 +610,7 @@ public interface ApiService {
*
* @return
*/
@GET("/stockType/app/search/list")
@GET("stockType/app/search/list")
Observable<BaseBean> getStockType(@QueryMap Map<String, Object> param);
/**
......@@ -618,7 +618,7 @@ public interface ApiService {
*
* @return
*/
@GET("/transitpart/{id}")
@GET("transitpart/{id}")
Observable<BaseBean> contactInfo(@Path("id") String id);
/**
......@@ -634,7 +634,7 @@ public interface ApiService {
*
* @return
*/
@GET("/invoiceApply/app/page/list/part")
@GET("invoiceApply/app/page/list/part")
Observable<BaseBean> openTicket(@QueryMap Map<String, Object> param);
/**
......@@ -642,7 +642,7 @@ public interface ApiService {
*
* @return
*/
@GET("/invoiceApply/so/page/list")
@GET("invoiceApply/so/page/list")
Observable<BaseBean> openSoTicket(@QueryMap Map<String, Object> param);
/**
......@@ -650,7 +650,7 @@ public interface ApiService {
*
* @return
*/
@GET("/invoiceApply/ao/page/list")
@GET("invoiceApply/ao/page/list")
Observable<BaseBean> openAoTicket(@QueryMap Map<String, Object> param);
/**
......@@ -658,7 +658,7 @@ public interface ApiService {
*
* @return
*/
@GET("/invoiceApply/po/page/list")
@GET("invoiceApply/po/page/list")
Observable<BaseBean> openPoTicket(@QueryMap Map<String, Object> param);
/**
......@@ -666,7 +666,7 @@ public interface ApiService {
*
* @return
*/
@GET("/invoiceApply/co/page/list")
@GET("invoiceApply/co/page/list")
Observable<BaseBean> openCoTicket(@QueryMap Map<String, Object> param);
/**
......@@ -674,7 +674,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/invoiceApply/so/exam")
@PUT("invoiceApply/so/exam")
Observable<BaseBean> soExam(@Body RequestBody requestBody);
/**
......@@ -682,7 +682,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/invoiceApply/ao/exam")
@PUT("invoiceApply/ao/exam")
Observable<BaseBean> aoExam(@Body RequestBody requestBody);
/**
......@@ -690,7 +690,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/invoiceApply/po/exam")
@PUT("invoiceApply/po/exam")
Observable<BaseBean> poExam(@Body RequestBody requestBody);
/**
......@@ -698,7 +698,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/invoiceApply/co/exam")
@PUT("invoiceApply/co/exam")
Observable<BaseBean> coExam(@Body RequestBody requestBody);
/**
......@@ -706,7 +706,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/receiptInvoiceApply/fo/exam")
@PUT("receiptInvoiceApply/fo/exam")
Observable<BaseBean> receiveFoExam(@Body RequestBody requestBody);
/**
......@@ -714,7 +714,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/receiptInvoiceApply/po/exam")
@PUT("receiptInvoiceApply/po/exam")
Observable<BaseBean> receivePoExam(@Body RequestBody requestBody);
/**
......@@ -722,7 +722,7 @@ public interface ApiService {
*
* @return
*/
@POST("/invoiceApply/so")
@POST("invoiceApply/so")
Observable<BaseBean> soApply(@Body RequestBody requestBody);
......@@ -731,7 +731,7 @@ public interface ApiService {
*
* @return
*/
@POST("/invoiceApply/ao")
@POST("invoiceApply/ao")
Observable<BaseBean> aoApply(@Body RequestBody requestBody);
......@@ -740,7 +740,7 @@ public interface ApiService {
*
* @return
*/
@POST("/invoiceApply/po")
@POST("invoiceApply/po")
Observable<BaseBean> poApply(@Body RequestBody requestBody);
......@@ -749,7 +749,7 @@ public interface ApiService {
*
* @return
*/
@POST("/invoiceApply/co")
@POST("invoiceApply/co")
Observable<BaseBean> coApply(@Body RequestBody requestBody);
/**
......@@ -757,7 +757,7 @@ public interface ApiService {
*
* @return
*/
@POST("/receiptInvoiceApply/fo")
@POST("receiptInvoiceApply/fo")
Observable<BaseBean> foReceipApply(@Body RequestBody requestBody);
/**
......@@ -765,7 +765,7 @@ public interface ApiService {
*
* @return
*/
@POST("/receiptInvoiceApply/po")
@POST("receiptInvoiceApply/po")
Observable<BaseBean> poReceiptApply(@Body RequestBody requestBody);
......@@ -774,7 +774,7 @@ public interface ApiService {
*
* @return
*/
@GET("/receiptInvoiceApply/po/page/list")
@GET("receiptInvoiceApply/po/page/list")
Observable<BaseBean> receivePoTicket(@QueryMap Map<String, Object> param);
......@@ -783,7 +783,7 @@ public interface ApiService {
*
* @return
*/
@GET("/receiptInvoiceApply/fo/page/list")
@GET("receiptInvoiceApply/fo/page/list")
Observable<BaseBean> receiveFoTicket(@QueryMap Map<String, Object> param);
/**
......@@ -791,7 +791,7 @@ public interface ApiService {
*
* @return
*/
@GET("/stockQuantity/app/page/list")
@GET("stockQuantity/app/page/list")
Observable<BaseBean> stockList(@QueryMap Map<String, Object> param);
/**
......@@ -799,7 +799,7 @@ public interface ApiService {
*
* @return
*/
@GET("/stockQuantityDetail/app/page/list")
@GET("stockQuantityDetail/app/page/list")
Observable<BaseBean> stockDetail(@QueryMap Map<String, Object> param);
/**
......@@ -807,7 +807,7 @@ public interface ApiService {
*
* @return
*/
@GET("/stockQuantityFlow/page/list")
@GET("stockQuantityFlow/page/list")
Observable<BaseBean> stockFlow(@QueryMap Map<String, Object> param);
/**
......@@ -815,7 +815,7 @@ public interface ApiService {
*
* @return
*/
@GET("/stockQuantityDetailFlow/page/list")
@GET("stockQuantityDetailFlow/page/list")
Observable<BaseBean> stockDetailFlow(@QueryMap Map<String, Object> param);
/**
......@@ -823,7 +823,7 @@ public interface ApiService {
*
* @return
*/
@GET("/stockQuantity/app/oneOfOrder/{orderId}")
@GET("stockQuantity/app/oneOfOrder/{orderId}")
Observable<BaseBean> stockDetailFlow(@Path("orderId") String id, @Query("orderType") String orderType);
/**
......@@ -831,7 +831,7 @@ public interface ApiService {
*
* @return
*/
@GET("/privilege/detail")
@GET("privilege/detail")
Observable<BaseBean> permissionDetail();
/**
......@@ -839,7 +839,7 @@ public interface ApiService {
*
* @return
*/
@GET("/moneyBackApply/page/list")
@GET("moneyBackApply/page/list")
Observable<BaseBean> moneyBack(@QueryMap Map<String, Object> param);
/**
......@@ -847,7 +847,7 @@ public interface ApiService {
*
* @return
*/
@GET("/moneyPayApply/page/list")
@GET("moneyPayApply/page/list")
Observable<BaseBean> moneyPay(@QueryMap Map<String, Object> param);
/**
......@@ -855,7 +855,7 @@ public interface ApiService {
*
* @return
*/
@GET("/dept-account-balance/page/list")
@GET("dept-account-balance/page/list")
Observable<BaseBean> account(@QueryMap Map<String, Object> param);
......@@ -866,7 +866,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/dept-account-balance/balance")
@PUT("dept-account-balance/balance")
Observable<BaseBean> freezeOrUnfreezeBalanceShelf(@Body RequestBody requestBody);
/**
......@@ -874,7 +874,7 @@ public interface ApiService {
*
* @return
*/
@GET("/finance-logistics-apply/page/list")
@GET("finance-logistics-apply/page/list")
Observable<BaseBean> logistic(@QueryMap Map<String, Object> param);
......@@ -883,7 +883,7 @@ public interface ApiService {
*
* @return
*/
@GET("/invoice-apply/item/list")
@GET("invoice-apply/item/list")
Observable<BaseBean> ticketDetail(@Query("applyId") String applyId);
/**
......@@ -891,7 +891,7 @@ public interface ApiService {
*
* @return
*/
@GET("/receiptInvoiceApplyItem/list")
@GET("receiptInvoiceApplyItem/list")
Observable<BaseBean> ticketReceiveDetail(@Query("applyId") String applyId);
/**
......@@ -899,7 +899,7 @@ public interface ApiService {
*
* @return
*/
@GET("/finance-logistics-apply/detail/page/list")
@GET("finance-logistics-apply/detail/page/list")
Observable<BaseBean> logisticsDetail(@Query("applyId") String applyId);
/**
......@@ -911,7 +911,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/finance-logistics-apply")
@PUT("finance-logistics-apply")
Observable<BaseBean> logisticsCheck(@Body RequestBody requestBody);
......@@ -926,7 +926,7 @@ public interface ApiService {
*
* @return
*/
@POST("/moneyBackApply/apply")
@POST("moneyBackApply/apply")
Observable<BaseBean> moneyBackApply(@Body RequestBody requestBody);
/**
......@@ -940,7 +940,7 @@ public interface ApiService {
*
* @return
*/
@POST("/moneyPayApply/apply")
@POST("moneyPayApply/apply")
Observable<BaseBean> moneyPayApply(@Body RequestBody requestBody);
/**
......@@ -948,7 +948,7 @@ public interface ApiService {
*
* @return
*/
@POST("/moneyBackApply/enableAmount")
@POST("moneyBackApply/enableAmount")
Observable<BaseBean> backEnableAmount(@Body RequestBody requestBody);
/**
......@@ -956,7 +956,7 @@ public interface ApiService {
*
* @return
*/
@POST("/moneyPayApply/enableAmount")
@POST("moneyPayApply/enableAmount")
Observable<BaseBean> payEnableAmount(@Body RequestBody requestBody);
/**
......@@ -970,7 +970,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/moneyBackApply/exam")
@PUT("moneyBackApply/exam")
Observable<BaseBean> checkMoneyBack(@Body RequestBody requestBody);
/**
......@@ -984,7 +984,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/moneyPayApply/exam")
@PUT("moneyPayApply/exam")
Observable<BaseBean> checkMoneyPay(@Body RequestBody requestBody);
......@@ -996,7 +996,7 @@ public interface ApiService {
*
* @return
*/
@GET("/saleOrder/forInvoice")
@GET("saleOrder/forInvoice")
Observable<BaseBean> saleTicketOrder(@QueryMap Map<String, Object> param);
/**
......@@ -1007,7 +1007,7 @@ public interface ApiService {
*
* @return
*/
@GET("/package-order/item/page/list")
@GET("package-order/item/page/list")
Observable<BaseBean> packageTicketOrder(@QueryMap Map<String, Object> param);
......@@ -1019,7 +1019,7 @@ public interface ApiService {
*
* @return
*/
@GET("/purchaseOrder/forInvoice")
@GET("purchaseOrder/forInvoice")
Observable<BaseBean> purchaseTicketOrder(@QueryMap Map<String, Object> param);
/**
......@@ -1031,7 +1031,7 @@ public interface ApiService {
*
* @return
*/
@GET("/crucibleSaleOrder/forInvoice")
@GET("crucibleSaleOrder/forInvoice")
Observable<BaseBean> crucibleTicketOrder(@QueryMap Map<String, Object> param);
......@@ -1043,7 +1043,7 @@ public interface ApiService {
*
* @return
*/
@GET("/purchaseOrder/item/page/list")
@GET("purchaseOrder/item/page/list")
Observable<BaseBean> purchaseOutTicketOrder(@QueryMap Map<String, Object> param);
/**
......@@ -1054,7 +1054,7 @@ public interface ApiService {
*
* @return
*/
@GET("/supplierOrder/item/page/list")
@GET("supplierOrder/item/page/list")
Observable<BaseBean> supplierTicketOrder(@QueryMap Map<String, Object> param);
/**
......@@ -1066,7 +1066,7 @@ public interface ApiService {
*
* @return
*/
@GET("/finance-dept-ar-ap-part-detail/app/page/list")
@GET("finance-dept-ar-ap-part-detail/app/page/list")
Observable<BaseBean> contactsMoney(@QueryMap Map<String, Object> param);
/**
......@@ -1078,7 +1078,7 @@ public interface ApiService {
*
* @return
*/
@GET("/finance-logistics/page/list")
@GET("finance-logistics/page/list")
Observable<BaseBean> contactsMoneyLogistic(@QueryMap Map<String, Object> param);
/**
......@@ -1090,7 +1090,7 @@ public interface ApiService {
*
* @return
*/
@GET("/finance-logistics-flow/page/list")
@GET("finance-logistics-flow/page/list")
Observable<BaseBean> contactsMoneyLogisticFlow(@QueryMap Map<String, Object> param);
/**
......@@ -1098,7 +1098,7 @@ public interface ApiService {
*
* @return
*/
@GET("/finance-dept-ar-ap-part/flow/page/list")
@GET("finance-dept-ar-ap-part/flow/page/list")
Observable<BaseBean> contactsMoneyFlow(@QueryMap Map<String, Object> param);
// /**
......@@ -1113,7 +1113,7 @@ public interface ApiService {
*
* @return
*/
@GET("/finance-fare/dept/fare/page/list")
@GET("finance-fare/dept/fare/page/list")
Observable<BaseBean> contactsLogistic(@QueryMap Map<String, Object> param);
......@@ -1122,7 +1122,7 @@ public interface ApiService {
*
* @return
*/
@POST("/finance-logistics-apply")
@POST("finance-logistics-apply")
Observable<BaseBean> logisticsApply(@Body RequestBody requestBody);
......@@ -1131,7 +1131,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/finance-tax/cancel/{id}")
@PUT("finance-tax/cancel/{id}")
Observable<BaseBean> storeFinancialCancel(@Path("id") String id);
/**
......@@ -1139,7 +1139,7 @@ public interface ApiService {
*
* @return
*/
@GET("/finance-tax/page/list")
@GET("finance-tax/page/list")
Observable<BaseBean> storeFinancial(@QueryMap Map<String, Object> param);
/**
......@@ -1147,7 +1147,7 @@ public interface ApiService {
*
* @return
*/
@GET("/finance-tax/detail/{taxId}")
@GET("finance-tax/detail/{taxId}")
Observable<BaseBean> storeFinancialDetail(@Path("taxId") String id);
/**
......@@ -1155,7 +1155,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/finance-tax/audit")
@PUT("finance-tax/audit")
Observable<BaseBean> storeFinancialCheck(@Body RequestBody requestBody);
/**
......@@ -1171,7 +1171,7 @@ public interface ApiService {
*
* @return
*/
@POST("/finance-tax/addApply")
@POST("finance-tax/addApply")
Observable<BaseBean> addFinancial(@Body RequestBody requestBody);
......@@ -1181,7 +1181,7 @@ public interface ApiService {
* @return
*/
@Multipart
@POST("/open/uploadImgs")
@POST("open/uploadImgs")
Observable<JSONObject> upload(@Part MultipartBody.Part avatar);
/**
......@@ -1189,7 +1189,7 @@ public interface ApiService {
*
* @return
*/
@GET("/stockQuantity/return-stock/page/list")
@GET("stockQuantity/return-stock/page/list")
Observable<BaseBean> tradingPro(@QueryMap Map<String, Object> param);
/**
......@@ -1197,7 +1197,7 @@ public interface ApiService {
*
* @return
*/
@GET("/insideOrder/usableProduct/page/list")
@GET("insideOrder/usableProduct/page/list")
Observable<BaseBean> tradingUsablePro(@QueryMap Map<String, Object> param);
// /**
......@@ -1213,7 +1213,7 @@ public interface ApiService {
*
* @return
*/
@GET("/product/page/list")
@GET("product/page/list")
Observable<BaseBean> tradingProDialog(@QueryMap Map<String, Object> param);
/**
......@@ -1221,7 +1221,7 @@ public interface ApiService {
*
* @return
*/
@GET("/package-order/app/page/list")
@GET("package-order/app/page/list")
Observable<BaseBean> productList(@QueryMap Map<String, Object> param);
/**
......@@ -1229,49 +1229,49 @@ public interface ApiService {
*
* @return
*/
@GET("/packageApply/app/page/list")
@GET("packageApply/app/page/list")
Observable<BaseBean> productApplyList(@QueryMap Map<String, Object> param);
/**
* @return
*/
@GET("/saleOrder/oneInfo/{orderId}")
@GET("saleOrder/oneInfo/{orderId}")
Observable<BaseBean> saleOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/**
* @return
*/
@GET("/package-order/oneInfo/{orderId}")
@GET("package-order/oneInfo/{orderId}")
Observable<BaseBean> productOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/**
* @return
*/
@GET("/purchaseOrder/oneInfo/{orderId}")
@GET("purchaseOrder/oneInfo/{orderId}")
Observable<BaseBean> purchaseOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/**
* @return
*/
@GET("/insideOrder/oneInfo/{orderId}")
@GET("insideOrder/oneInfo/{orderId}")
Observable<BaseBean> insideOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/**
* @return
*/
@GET("/crucibleOrder/oneInfo/{orderId}")
@GET("crucibleOrder/oneInfo/{orderId}")
Observable<BaseBean> crucibleOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/**
* @return
*/
@GET("/crucibleSaleOrder/oneInfo/{orderId}")
@GET("crucibleSaleOrder/oneInfo/{orderId}")
Observable<BaseBean> crucibleSaleOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/**
* @return
*/
@GET("/supplierOrder/oneInfo/{orderId}")
@GET("supplierOrder/oneInfo/{orderId}")
Observable<BaseBean> supplierOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/**
......@@ -1279,7 +1279,7 @@ public interface ApiService {
*
* @return
*/
@GET("/pick-apply/fo/page/list")
@GET("pick-apply/fo/page/list")
Observable<BaseBean> pickApplyList(@QueryMap Map<String, Object> param);
/**
......@@ -1287,14 +1287,14 @@ public interface ApiService {
*
* @return
*/
@GET("/pick-apply/io/page/list")
@GET("pick-apply/io/page/list")
Observable<BaseBean> pickIoApplyList(@QueryMap Map<String, Object> param);
/**
* 获取供应订单领料申请分页列表
*
* @return
*/
@GET("/pick-apply/po/page/list")
@GET("pick-apply/po/page/list")
Observable<BaseBean> pickPoApplyList(@QueryMap Map<String, Object> param);
/**
......@@ -1302,7 +1302,7 @@ public interface ApiService {
*
* @return
*/
@GET("/send-out-store-apply/page/list")
@GET("send-out-store-apply/page/list")
Observable<BaseBean> sendApplyList(@QueryMap Map<String, Object> param);
/**
......@@ -1326,7 +1326,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/send-out-store-apply/status")
@PUT("send-out-store-apply/status")
Observable<BaseBean> sendApplyCheck(@Body RequestBody requestBody);
/**
......@@ -1334,7 +1334,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/pick-apply/fo/status")
@PUT("pick-apply/fo/status")
Observable<BaseBean> pickApplyCheck(@Body RequestBody requestBody);
/**
......@@ -1342,14 +1342,14 @@ public interface ApiService {
*
* @return
*/
@PUT("/pick-apply/io/status")
@PUT("pick-apply/io/status")
Observable<BaseBean> pickIoApplyCheck(@Body RequestBody requestBody);
/**
* 审批领料申请
*
* @return
*/
@PUT("/pick-apply/po/status")
@PUT("pick-apply/po/status")
Observable<BaseBean> pickPoApplyCheck(@Body RequestBody requestBody);
/**
......@@ -1357,7 +1357,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/send-out-store-apply/co/status")
@PUT("send-out-store-apply/co/status")
Observable<BaseBean> sendCoApplyCheck(@Body RequestBody requestBody);
/**
......@@ -1365,7 +1365,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/send-out-store-apply/po/status")
@PUT("send-out-store-apply/po/status")
Observable<BaseBean> sendPoApplyCheck(@Body RequestBody requestBody);
/**
......@@ -1373,7 +1373,7 @@ public interface ApiService {
*
* @return
*/
@GET("/send-out-store-apply/item/list")
@GET("send-out-store-apply/item/list")
Observable<BaseBean> sendApplyDetail(@Query("applyId") String applyId);
/**
......@@ -1381,7 +1381,7 @@ public interface ApiService {
*
* @return
*/
@GET("/send-out-store-crucible/detail/page/list")
@GET("send-out-store-crucible/detail/page/list")
Observable<BaseBean> sendApplyCrucibleDetail(@QueryMap Map<String, Object> param);
......@@ -1390,7 +1390,7 @@ public interface ApiService {
*
* @return
*/
@GET("/pick-apply/fo/item/list")
@GET("pick-apply/fo/item/list")
Observable<BaseBean> pickApplyDetail(@Query("applyId") String applyId);
/**
......@@ -1398,7 +1398,7 @@ public interface ApiService {
*
* @return
*/
@GET("/pick-apply/io/item/list")
@GET("pick-apply/io/item/list")
Observable<BaseBean> pickIoApplyDetail(@Query("applyId") String applyId);
/**
......@@ -1406,7 +1406,7 @@ public interface ApiService {
*
* @return
*/
@GET("/pick-apply/po/item/list")
@GET("pick-apply/po/item/list")
Observable<BaseBean> pickPoApplyDetail(@Query("applyId") String applyId);
/**
......@@ -1414,7 +1414,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/so/applyOutStock/{orderId}")
@POST("procedureStart/so/applyOutStock/{orderId}")
Observable<BaseBean> sendApply(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
......@@ -1422,7 +1422,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/so/applyOutStock/forward/{orderId}")
@POST("procedureStart/so/applyOutStock/forward/{orderId}")
Observable<BaseBean> sendForwardApply(@Path("orderId") String orderId, @Body RequestBody requestBody);
......@@ -1431,7 +1431,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/fo/applyOutStock/{orderId}")
@POST("procedureStart/fo/applyOutStock/{orderId}")
Observable<BaseBean> pickApply(@Path("orderId")String orderId, @Body RequestBody requestBody);
/**
......@@ -1439,7 +1439,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/io/applyOutStock/{orderId}")
@POST("procedureStart/io/applyOutStock/{orderId}")
Observable<BaseBean> pickIoApply(@Path("orderId")String orderId, @Body RequestBody requestBody);
/**
......@@ -1447,7 +1447,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/po/applyPick/{orderId}")
@POST("procedureStart/po/applyPick/{orderId}")
Observable<BaseBean> pickPoApply(@Path("orderId")String orderId, @Body RequestBody requestBody);
/**
......@@ -1455,7 +1455,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/co/applyOutStock/{orderId}")
@POST("procedureStart/co/applyOutStock/{orderId}")
Observable<BaseBean> sendCoApply(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
......@@ -1463,7 +1463,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/po/applyOutStock/{orderId}")
@POST("procedureStart/po/applyOutStock/{orderId}")
Observable<BaseBean> sendPoApply(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
......@@ -1471,7 +1471,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/so/applyAdvanceFinish/{orderId}")
@POST("procedureStart/so/applyAdvanceFinish/{orderId}")
Observable<BaseBean> endApply(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
......@@ -1479,7 +1479,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/po/applyAdvanceFinish/{orderId}")
@POST("procedureStart/po/applyAdvanceFinish/{orderId}")
Observable<BaseBean> endPoApply(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
......@@ -1487,7 +1487,7 @@ public interface ApiService {
*
* @return
*/
@GET("/advance-finish-apply/so/logs/{orderId}")
@GET("advance-finish-apply/so/logs/{orderId}")
Observable<BaseBean> endApplyList(@Path("orderId") String orderId, @QueryMap Map<String, Object> param);
/**
......@@ -1495,7 +1495,7 @@ public interface ApiService {
*
* @return
*/
@GET("/advance-finish-apply/po/logs/{orderId}")
@GET("advance-finish-apply/po/logs/{orderId}")
Observable<BaseBean> endPoApplyList(@Path("orderId") String orderId, @QueryMap Map<String, Object> param);
/**
......@@ -1503,7 +1503,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/so/applyUse/{orderId}")
@POST("procedureStart/so/applyUse/{orderId}")
Observable<BaseBean> useApplyAdd(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
......@@ -1511,7 +1511,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/po/applyUse/{orderId}")
@POST("procedureStart/po/applyUse/{orderId}")
Observable<BaseBean> usePoApplyAdd(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
......@@ -1519,7 +1519,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/ao/applyUse/{orderId}")
@POST("procedureStart/ao/applyUse/{orderId}")
Observable<BaseBean> useAoApplyAdd(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
......@@ -1527,7 +1527,7 @@ public interface ApiService {
*
* @return
*/
@GET("/useApply/so/page/list")
@GET("useApply/so/page/list")
Observable<BaseBean> useApply(@QueryMap Map<String, Object> param);
/**
......@@ -1535,7 +1535,7 @@ public interface ApiService {
*
* @return
*/
@GET("/useApply/ao/page/list")
@GET("useApply/ao/page/list")
Observable<BaseBean> useAoApply(@QueryMap Map<String, Object> param);
/**
......@@ -1543,7 +1543,7 @@ public interface ApiService {
*
* @return
*/
@GET("/useApply/po/page/list")
@GET("useApply/po/page/list")
Observable<BaseBean> usePoApply(@QueryMap Map<String, Object> param);
/**
......@@ -1551,7 +1551,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/useApply/so/audit/{applyId}")
@PUT("useApply/so/audit/{applyId}")
Observable<BaseBean> useApplyCheck(@Path("applyId") String applyId, @Body RequestBody requestBody);
/**
......@@ -1559,7 +1559,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/useApply/ao/audit/{applyId}")
@PUT("useApply/ao/audit/{applyId}")
Observable<BaseBean> useAoApplyCheck(@Path("applyId") String applyId, @Body RequestBody requestBody);
/**
......@@ -1567,7 +1567,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/useApply/po/audit/{applyId}")
@PUT("useApply/po/audit/{applyId}")
Observable<BaseBean> usePoApplyCheck(@Path("applyId") String applyId, @Body RequestBody requestBody);
/**
......@@ -1575,7 +1575,7 @@ public interface ApiService {
*
* @return
*/
@GET("/returnApply/so/page/list")
@GET("returnApply/so/page/list")
Observable<BaseBean> returnApplyList(@QueryMap Map<String, Object> param);
/**
......@@ -1583,7 +1583,7 @@ public interface ApiService {
*
* @return
*/
@GET("/returnApply/po/page/list")
@GET("returnApply/po/page/list")
Observable<BaseBean> returnPoApplyList(@QueryMap Map<String, Object> param);
/**
......@@ -1591,7 +1591,7 @@ public interface ApiService {
*
* @return
*/
@GET("/returnApply/fo/page/list")
@GET("returnApply/fo/page/list")
Observable<BaseBean> returnFoApplyList(@QueryMap Map<String, Object> param);
/**
......@@ -1614,7 +1614,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/po/applyReturn/{id}")
@POST("procedureStart/po/applyReturn/{id}")
Observable<BaseBean> returnPoAdd(@Path("id") String id, @Body RequestBody requestBody);
/**
......@@ -1623,7 +1623,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/fo/pickReturn/{id}")
@POST("procedureStart/fo/pickReturn/{id}")
Observable<BaseBean> pickReturnFoAdd(@Path("id") String id, @Body RequestBody requestBody);
/**
* 领料退回申请
......@@ -1631,7 +1631,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/po/pickReturn/{id}")
@POST("procedureStart/po/pickReturn/{id}")
Observable<BaseBean> pickReturnPoAdd(@Path("id") String id, @Body RequestBody requestBody);
/**
......@@ -1639,7 +1639,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/fo/applyReturn/{id}")
@POST("procedureStart/fo/applyReturn/{id}")
Observable<BaseBean> returnFoAdd(@Path("id") String id, @Body RequestBody requestBody);
/**
......@@ -1647,7 +1647,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/so/applyReturn/{id}")
@POST("procedureStart/so/applyReturn/{id}")
Observable<BaseBean> returnSoAdd(@Path("id") String id, @Body RequestBody requestBody);
......@@ -1656,7 +1656,7 @@ public interface ApiService {
*
* @return
*/
@GET("/stock/find/dept")
@GET("stock/find/dept")
Observable<BaseBean> returnDept(@Query("deptId") String id);
/**
......@@ -1664,7 +1664,7 @@ public interface ApiService {
*
* @return
*/
@GET("/returnApplyFlow/list")
@GET("returnApplyFlow/list")
Observable<BaseBean> returnFlowList(@QueryMap Map<String, Object> param);
/**
......@@ -1672,7 +1672,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/so/applyStock/{orderItemId}")
@POST("procedureStart/so/applyStock/{orderItemId}")
Observable<BaseBean> addStockApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
......@@ -1689,7 +1689,7 @@ public interface ApiService {
*
* @return
*/
@GET("/production-plan-quantity/page/list")
@GET("production-plan-quantity/page/list")
Observable<BaseBean> productionPlan(@QueryMap Map<String, Object> param);
/**
......@@ -1697,7 +1697,7 @@ public interface ApiService {
*
* @return
*/
@GET("/enter-store-crucible/detail/page/list")
@GET("enter-store-crucible/detail/page/list")
Observable<BaseBean> enterCrucibleDetail(@QueryMap Map<String, Object> param);
/**
......@@ -1705,7 +1705,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/co/applyStock/{orderItemId}")
@POST("procedureStart/co/applyStock/{orderItemId}")
Observable<BaseBean> addStockCoApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
/**
......@@ -1713,7 +1713,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/io/applyStock/{orderItemId}")
@POST("procedureStart/io/applyStock/{orderItemId}")
Observable<BaseBean> addStockIoApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
/**
......@@ -1721,7 +1721,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/fo/applyStock/{orderItemId}")
@POST("procedureStart/fo/applyStock/{orderItemId}")
Observable<BaseBean> addFoStockApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
/**
......@@ -1729,7 +1729,7 @@ public interface ApiService {
*
* @return
*/
@POST("/procedureStart/po/applyStock/{orderItemId}")
@POST("procedureStart/po/applyStock/{orderItemId}")
Observable<BaseBean> addPoStockApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
/**
......@@ -1737,7 +1737,7 @@ public interface ApiService {
*
* @return
*/
@GET("/enterStoreApply/so/app/page/list")
@GET("enterStoreApply/so/app/page/list")
Observable<BaseBean> addStockApplyList(@QueryMap Map<String, Object> param);
/**
......@@ -1745,7 +1745,7 @@ public interface ApiService {
*
* @return
*/
@GET("/enterStoreApply/fo/app/page/list")
@GET("enterStoreApply/fo/app/page/list")
Observable<BaseBean> addFoStockApplyList(@QueryMap Map<String, Object> param);
/**
......@@ -1753,7 +1753,7 @@ public interface ApiService {
*
* @return
*/
@GET("/enterStoreApply/co/app/page/list")
@GET("enterStoreApply/co/app/page/list")
Observable<BaseBean> addCoStockApplyList(@QueryMap Map<String, Object> param);
/**
......@@ -1761,7 +1761,7 @@ public interface ApiService {
*
* @return
*/
@GET("/enterStoreApply/io/app/page/list")
@GET("enterStoreApply/io/app/page/list")
Observable<BaseBean> addIoStockApplyList(@QueryMap Map<String, Object> param);
/**
......@@ -1769,7 +1769,7 @@ public interface ApiService {
*
* @return
*/
@GET("/enterStoreApply/po/app/page/list")
@GET("enterStoreApply/po/app/page/list")
Observable<BaseBean> addPoStockApplyList(@QueryMap Map<String, Object> param);
/**
......@@ -1777,7 +1777,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/enterStoreApply/po/audit/{id}")
@PUT("enterStoreApply/po/audit/{id}")
Observable<BaseBean> addPoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
/**
......@@ -1785,7 +1785,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/enterStoreApply/so/audit/{id}")
@PUT("enterStoreApply/so/audit/{id}")
Observable<BaseBean> addStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
/**
......@@ -1793,7 +1793,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/enterStoreApply/fo/audit/{id}")
@PUT("enterStoreApply/fo/audit/{id}")
Observable<BaseBean> addFoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
/**
......@@ -1801,7 +1801,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/enterStoreApply/co/audit/{id}")
@PUT("enterStoreApply/co/audit/{id}")
Observable<BaseBean> addCoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
/**
......@@ -1809,7 +1809,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/enterStoreApply/io/audit/{id}")
@PUT("enterStoreApply/io/audit/{id}")
Observable<BaseBean> addIoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
/**
......@@ -1817,7 +1817,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/insideOrder/apply/{orderId}")
@PUT("insideOrder/apply/{orderId}")
Observable<BaseBean> insideOrderApplyCheck(@Path("orderId") String id, @Body RequestBody requestBody);
/**
......@@ -1825,7 +1825,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/saleOrder/apply/{orderId}")
@PUT("saleOrder/apply/{orderId}")
Observable<BaseBean> saleOrderApplyCheck(@Path("orderId") String id, @Body RequestBody requestBody);
/**
......@@ -1833,7 +1833,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/supplierOrder/apply/{orderId}")
@PUT("supplierOrder/apply/{orderId}")
Observable<BaseBean> supplierOrderApplyCheck(@Path("orderId") String id, @Body RequestBody requestBody);
/**
......@@ -1841,7 +1841,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/crucibleOrder/apply/{orderId}")
@PUT("crucibleOrder/apply/{orderId}")
Observable<BaseBean> crucibleApplyCheck(@Path("orderId") String id, @Body RequestBody requestBody);
/**
......@@ -1849,7 +1849,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/purchaseOrder/apply/{orderId}")
@PUT("purchaseOrder/apply/{orderId}")
Observable<BaseBean> purchaseOrderApplyCheck(@Path("orderId") String id, @Body RequestBody requestBody);
/**
......@@ -1857,7 +1857,7 @@ public interface ApiService {
*
* @return
*/
@GET("/enterStoreApply/fo/app/quality-inspection/page/list")
@GET("enterStoreApply/fo/app/quality-inspection/page/list")
Observable<BaseBean> enterStoreApplyList(@QueryMap Map<String, Object> param);
......@@ -1866,7 +1866,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/enterStoreApply/fo/quality-inspection/audit/{id}")
@PUT("enterStoreApply/fo/quality-inspection/audit/{id}")
Observable<BaseBean> enterFoStoreApplyList(@Path("id") String id, @Body RequestBody requestBody);
/**
......@@ -1874,7 +1874,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/returnApply/so/audit/{applyId}")
@PUT("returnApply/so/audit/{applyId}")
Observable<BaseBean> soReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
......@@ -1882,7 +1882,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/returnApply/so/audit/business/{applyId}")
@PUT("returnApply/so/audit/business/{applyId}")
Observable<BaseBean> soBusinessReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
......@@ -1890,7 +1890,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/returnApply/so/audit/finance/{applyId}")
@PUT("returnApply/so/audit/finance/{applyId}")
Observable<BaseBean> soFinanceReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
......@@ -1898,7 +1898,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/returnApply/so/audit/group/{applyId}")
@PUT("returnApply/so/audit/group/{applyId}")
Observable<BaseBean> soGroupReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
......@@ -1907,7 +1907,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/returnApply/po/audit/{applyId}")
@PUT("returnApply/po/audit/{applyId}")
Observable<BaseBean> poReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
......@@ -1915,7 +1915,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/returnApply/po/audit/business/{applyId}")
@PUT("returnApply/po/audit/business/{applyId}")
Observable<BaseBean> poBusinessReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
......@@ -1923,7 +1923,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/returnApply/po/audit/finance/{applyId}")
@PUT("returnApply/po/audit/finance/{applyId}")
Observable<BaseBean> poFinanceReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
......@@ -1931,7 +1931,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/returnApply/po/audit/group/{applyId}")
@PUT("returnApply/po/audit/group/{applyId}")
Observable<BaseBean> poGroupReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
......@@ -1948,7 +1948,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/returnApply/fo/audit/group/{applyId}")
@PUT("returnApply/fo/audit/group/{applyId}")
Observable<BaseBean> foGroupReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
......@@ -1956,7 +1956,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/returnApply/fo/pick-return/audit/group/{applyId}")
@PUT("returnApply/fo/pick-return/audit/group/{applyId}")
Observable<BaseBean> foGroupPickReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
......@@ -1964,7 +1964,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/returnApply/po/pick-return/audit/group/{applyId}")
@PUT("returnApply/po/pick-return/audit/group/{applyId}")
Observable<BaseBean> poGroupPickReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
......@@ -1973,7 +1973,7 @@ public interface ApiService {
*
* @return
*/
@GET("/orderFlow/orderItem/allFlows/{orderItemId}")
@GET("orderFlow/orderItem/allFlows/{orderItemId}")
Observable<BaseBean> orderItemFlow(@Path("orderItemId") String orderItemId);
/**
......@@ -1981,7 +1981,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/saleOrder/audit/{orderId}")
@PUT("saleOrder/audit/{orderId}")
Observable<BaseBean> saleOrderCheck(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
......@@ -1989,7 +1989,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/supplierOrder/audit/{orderId}")
@PUT("supplierOrder/audit/{orderId}")
Observable<BaseBean> supplierOrderCheck(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
......@@ -1997,7 +1997,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/insideOrder/audit/{orderId}")
@PUT("insideOrder/audit/{orderId}")
Observable<BaseBean> insideOrderCheck(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
......@@ -2005,7 +2005,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/purchaseOrder/audit/{orderId}")
@PUT("purchaseOrder/audit/{orderId}")
Observable<BaseBean> purchaseOrderCheck(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
......@@ -2013,7 +2013,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/crucibleOrder/audit/{orderId}")
@PUT("crucibleOrder/audit/{orderId}")
Observable<BaseBean> crucibleOrderCheck(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
......@@ -2021,7 +2021,7 @@ public interface ApiService {
*
* @return
*/
@GET("/notice-message-item/page/init")
@GET("notice-message-item/page/init")
Observable<BaseBean> msg(@QueryMap Map<String, Object> param);
/**
......@@ -2029,7 +2029,7 @@ public interface ApiService {
*
* @return
*/
@POST("/notice-message-item/has_read")
@POST("notice-message-item/has_read")
Observable<BaseBean> msgRead(@Body RequestBody requestBody);
/**
......@@ -2037,7 +2037,7 @@ public interface ApiService {
*
* @return
*/
@GET("/notice-message-item/content")
@GET("notice-message-item/content")
Observable<BaseBean> msgContent(@Query("id") String id);
/**
......@@ -2045,7 +2045,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/purchaseOrder/enter-stock-type")
@PUT("purchaseOrder/enter-stock-type")
Observable<BaseBean> purchaseOrderStockType(@QueryMap Map<String, Object> param);
/**
......@@ -2053,7 +2053,7 @@ public interface ApiService {
*
* @return
*/
@GET("/saleOrder/item/page/list")
@GET("saleOrder/item/page/list")
Observable<BaseBean> saleOrderPro(@QueryMap Map<String, Object> param);
/**
......@@ -2061,7 +2061,7 @@ public interface ApiService {
*
* @return
*/
@GET("/product/can-package/page/list")
@GET("product/can-package/page/list")
Observable<BaseBean> saleOrderTargetPro(@QueryMap Map<String, Object> param);
/**
......@@ -2069,7 +2069,7 @@ public interface ApiService {
*
* @return
*/
@GET("/package-end/item/list")
@GET("package-end/item/list")
Observable<BaseBean> packageEndPro(@Query("applyId") Integer id);
/**
......@@ -2077,7 +2077,7 @@ public interface ApiService {
*
* @return
*/
@GET("/package-source/item/list")
@GET("package-source/item/list")
Observable<BaseBean> packageSourcePro(@Query("applyId") Integer id);
/**
......@@ -2085,7 +2085,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/packageApply/exam/{applyId}")
@PUT("packageApply/exam/{applyId}")
Observable<BaseBean> packageApply(@Path("applyId") String id, @Body RequestBody requestBody);
......@@ -2094,7 +2094,7 @@ public interface ApiService {
*
* @return
*/
@GET("/biz-approval/page/list")
@GET("biz-approval/page/list")
Observable<BaseBean> bizApproval(@QueryMap Map<String, Object> param);
/**
......@@ -2102,7 +2102,7 @@ public interface ApiService {
*
* @return
*/
@GET("/biz-approval/by-me")
@GET("biz-approval/by-me")
Observable<BaseBean> bizMeApproval(@QueryMap Map<String, Object> param);
/**
......@@ -2110,7 +2110,7 @@ public interface ApiService {
*
* @return
*/
@GET("/back/noticeAnnounce/page")
@GET("back/noticeAnnounce/page")
Observable<BaseBean> notice(@QueryMap Map<String, Object> param);
/**
......@@ -2118,7 +2118,7 @@ public interface ApiService {
*
* @return
*/
@GET("/back/noticeAnnounce/{id}")
@GET("back/noticeAnnounce/{id}")
Observable<BaseBean> noticeDetail(@Path("id") String id);
/**
......@@ -2126,7 +2126,7 @@ public interface ApiService {
*
* @return
*/
@GET("/equipment/page/list")
@GET("equipment/page/list")
Observable<BaseBean> equipmentList(@QueryMap Map<String, Object> param);
/**
......@@ -2134,7 +2134,7 @@ public interface ApiService {
*
* @return
*/
@GET("/equipment/list")
@GET("equipment/list")
Observable<BaseBean> equipmentNoPageList(@QueryMap Map<String, Object> param);
/**
......@@ -2142,7 +2142,7 @@ public interface ApiService {
*
* @return
*/
@GET("/spare-part/page/list")
@GET("spare-part/page/list")
Observable<BaseBean> sparePartList(@QueryMap Map<String, Object> param);
/**
......@@ -2150,7 +2150,7 @@ public interface ApiService {
*
* @return
*/
@GET("/equipmentRepair/page/list")
@GET("equipmentRepair/page/list")
Observable<BaseBean> equipmentRepairList(@QueryMap Map<String, Object> param);
/**
......@@ -2158,7 +2158,7 @@ public interface ApiService {
*
* @return
*/
@GET("/equipmentPurchase/page/list")
@GET("equipmentPurchase/page/list")
Observable<BaseBean> equipmentPurchaseList(@QueryMap Map<String, Object> param);
/**
......@@ -2166,7 +2166,7 @@ public interface ApiService {
*
* @return
*/
@POST("/equipmentPurchase")
@POST("equipmentPurchase")
Observable<BaseBean> addEquipmentPurchase(@Body RequestBody requestBody);
/**
......@@ -2174,7 +2174,7 @@ public interface ApiService {
*
* @return
*/
@POST("/equipmentRepair")
@POST("equipmentRepair")
Observable<BaseBean> addEquipmentRepair(@Body RequestBody requestBody);
/**
......@@ -2182,7 +2182,7 @@ public interface ApiService {
*
* @return
*/
@GET("/equipmentPurchaseItem/list")
@GET("equipmentPurchaseItem/list")
Observable<BaseBean> equipmentPurchaseItemList(@Query("equipmentPurchaseId") String id);
/**
......@@ -2190,7 +2190,7 @@ public interface ApiService {
*
* @return
*/
@GET("/equipmentRepairItem/list")
@GET("equipmentRepairItem/list")
Observable<BaseBean> equipmentRepairItemList(@Query("equipmentRepairId") String id);
......@@ -2199,7 +2199,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/equipmentPurchase/audit")
@PUT("equipmentPurchase/audit")
Observable<BaseBean> equipmentPurchaseAudit(@Body RequestBody requestBody);
/**
......@@ -2207,7 +2207,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/equipmentRepair/audit")
@PUT("equipmentRepair/audit")
Observable<BaseBean> equipmentRepairAudit(@Body RequestBody requestBody);
/**
......@@ -2215,7 +2215,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/equipmentPurchase/apply")
@PUT("equipmentPurchase/apply")
Observable<BaseBean> equipmentPurchaseApply(@Body RequestBody requestBody);
/**
......@@ -2223,7 +2223,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/equipmentRepair/apply")
@PUT("equipmentRepair/apply")
Observable<BaseBean> equipmentRepairApply(@Body RequestBody requestBody);
/**
......@@ -2231,7 +2231,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/equipmentPurchase/finish/{orderId}")
@PUT("equipmentPurchase/finish/{orderId}")
Observable<BaseBean> equipmentPurchaseFinish(@Path("orderId") String orderId);
/**
......@@ -2239,7 +2239,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/equipmentRepair/finish/{orderId}")
@PUT("equipmentRepair/finish/{orderId}")
Observable<BaseBean> equipmentRepairFinish(@Path("orderId") String orderId);
......@@ -2248,7 +2248,7 @@ public interface ApiService {
*
* @return
*/
@GET("/product/process-list")
@GET("product/process-list")
Observable<BaseBean> productProcess();
......@@ -2257,7 +2257,7 @@ public interface ApiService {
*
* @return
*/
@GET("/dept-account-balance/app/co/account-balance-info")
@GET("dept-account-balance/app/co/account-balance-info")
Observable<BaseBean> groupMoney();
/**
......@@ -2265,7 +2265,7 @@ public interface ApiService {
*
* @return
*/
@GET("/dept-account-balance/app/tax/account-balance-info")
@GET("dept-account-balance/app/tax/account-balance-info")
Observable<BaseBean> bankMoney();
/**
......@@ -2273,7 +2273,7 @@ public interface ApiService {
*
* @return
*/
@GET("/dept-account-balance/app/exchange/account-balance-info")
@GET("dept-account-balance/app/exchange/account-balance-info")
Observable<BaseBean> taxMoney();
......@@ -2282,7 +2282,7 @@ public interface ApiService {
*
* @return
*/
@GET("/dept-account-balance/app/account-balance-info")
@GET("dept-account-balance/app/account-balance-info")
Observable<BaseBean> depMoney();
/**
......@@ -2290,7 +2290,7 @@ public interface ApiService {
*
* @return
*/
@DELETE("/sys/dept/ruler")
@DELETE("sys/dept/ruler")
Observable<BaseBean> deleteDeptRuler(@Query("userId") String userId, @Query("deptId") String deptId);
/**
......@@ -2298,7 +2298,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/sys/dept/ruler")
@PUT("sys/dept/ruler")
Observable<BaseBean> addDeptRuler(@Query("userId") String userId, @Body RequestBody requestBody);
/**
......@@ -2306,7 +2306,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/advance-finish-apply/so/audit/{applyId}")
@PUT("advance-finish-apply/so/audit/{applyId}")
Observable<BaseBean> endSoCheck(@Path("applyId") String applyId, @Body RequestBody requestBody);
/**
......@@ -2314,7 +2314,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/advance-finish-apply/po/audit/{applyId}")
@PUT("advance-finish-apply/po/audit/{applyId}")
Observable<BaseBean> endPoCheck(@Path("applyId") String applyId, @Body RequestBody requestBody);
/**
......@@ -2322,7 +2322,7 @@ public interface ApiService {
*
* @return
*/
@POST("/stock-quantity/dept-product/startOrderProductsCountCheck")
@POST("stock-quantity/dept-product/startOrderProductsCountCheck")
Observable<BaseBean> proNumCheck(@Body RequestBody requestBody);
/**
......@@ -2331,7 +2331,7 @@ public interface ApiService {
*
* @return
*/
@GET("/receive-order/info")
@GET("receive-order/info")
Observable<BaseBean> receiveOrderInfo(@QueryMap Map<String, Object> param);
......@@ -2348,7 +2348,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/useApply/so/usedStore")
@PUT("useApply/so/usedStore")
Observable<BaseBean> soUsedStore(@Body RequestBody requestBody);
/**
......@@ -2356,7 +2356,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/useApply/po/usedStore")
@PUT("useApply/po/usedStore")
Observable<BaseBean> poUsedStore(@Body RequestBody requestBody);
/**
......@@ -2364,7 +2364,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/useApply/ao/usedStore")
@PUT("useApply/ao/usedStore")
Observable<BaseBean> aoUsedStore(@Body RequestBody requestBody);
/**
......@@ -2372,7 +2372,7 @@ public interface ApiService {
*
* @return
*/
@GET("/returnApply/pageByTransitPart")
@GET("returnApply/pageByTransitPart")
Observable<BaseBean> returnApplyByTransitPart(@QueryMap Map<String, Object> param);
......@@ -2381,7 +2381,7 @@ public interface ApiService {
*
* @return
*/
@GET("/mark/one")
@GET("mark/one")
Observable<BaseBean> getTemplate(@QueryMap Map<String, Object> param);
/**
......@@ -2389,7 +2389,7 @@ public interface ApiService {
*
* @return
*/
@PUT("/mark")
@PUT("mark")
Observable<BaseBean> setTemplate(@Body RequestBody requestBody);
/**
......@@ -2397,7 +2397,7 @@ public interface ApiService {
*
* @return
*/
@GET("/mark-order-rel/one")
@GET("mark-order-rel/one")
Observable<BaseBean> getOrderMark(@QueryMap Map<String, Object> param);
......@@ -2406,14 +2406,14 @@ public interface ApiService {
*
* @return
*/
@PUT("/mark-order-rel")
@PUT("mark-order-rel")
Observable<BaseBean> changeOrderMark(@Body RequestBody requestBody);
/**
* 运费单分页列
*
* @return
*/
@GET("/finance-fare/page/list")
@GET("finance-fare/page/list")
Observable<BaseBean> fareList(@QueryMap Map<String, Object> param);
/**
......@@ -2421,7 +2421,7 @@ public interface ApiService {
*
* @return
*/
@GET("/send-out-store-apply/logistics/page/list")
@GET("send-out-store-apply/logistics/page/list")
Observable<BaseBean> logisticsList(@QueryMap Map<String, Object> param);
/**
......@@ -2429,7 +2429,7 @@ public interface ApiService {
*
* @return
*/
@POST("/finance-fare")
@POST("finance-fare")
Observable<BaseBean> fareAdd(@Body RequestBody requestBody);
}
......@@ -22,7 +22,7 @@ import retrofit2.http.Query;
**/
public interface MesApiService {
String DOMAIN = Config.DEBUG ? "http://192.168.3.32/" : "http://114.116.55.221/";
String DOMAIN = Config.DEBUG ? "http://192.168.3.32/" : "http://124.129.27.194:81/";
/**
......
......@@ -10,7 +10,6 @@ import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.JsonObject;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
......
......@@ -115,6 +115,8 @@ public class MesReportActivity extends WorkBaseActivity {
topAdapter.bindToRecyclerView(rvTop);
proBadAdapter.bindToRecyclerView(rvProBad);
param = WorkUtils.simpleParam();
param.put("beginDate", TimeUtils.getNowString());
param.put("endDate", TimeUtils.getNowString());
badParam = WorkUtils.simpleParam();
badParam.put("beginDate", TimeUtils.getNowString());
badParam.put("endDate", TimeUtils.getNowString());
......
......@@ -75,9 +75,10 @@ public class WorkUtils {
String domain = Config.DEBUG ? "http://zwang.bat100.net.cn:8000/%s/" : "http://zwang.bat100.net.cn:8000/%s/";
String loginType = TextUtils.isEmpty(DataKeeper.getInstance().getBatLoginType()) ? BatLoginType.GK.getCode() : DataKeeper.getInstance().getBatLoginType();
return "http://pre-release.bat100.net.cn:9001/";
// return "http://pre-release.bat100.net.cn:9001/";
// return "http://192.168.43.20:9003/";
// return "http://192.168.1.155:9003/";
return "http://zwang.bat100.net.cn/api/";
// return String.format(domain, loginType);
}
......
......@@ -67,5 +67,5 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
</LinearLayout>
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论