|
|
@@ -251,7 +251,6 @@ public class InvoiceController {
|
|
|
logger.log("平台出货单管理", "查看待出货");
|
|
|
PageInfo info = new PageInfo(params);
|
|
|
info.filter("status", Status.TOBESHIPPED.value());
|
|
|
- info.filter("sellerenuu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
return invoiceService.findPageByStatus(info, keyword, Type.Invoice_Vender_code.value());
|
|
|
}
|
|
|
|
|
|
@@ -289,23 +288,6 @@ public class InvoiceController {
|
|
|
return invoiceService.findAdminInFpu(pageInfo, keyword, status, Type.Invoice_Vender_code.value());
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 查看企业已收货
|
|
|
- *
|
|
|
- * @param params the params 分页参数
|
|
|
- * @param keyword the keyword 搜索字符串
|
|
|
- * @return page 返回InvoiceFPurchase的page对象
|
|
|
- */
|
|
|
- @RequestMapping(value = "/inFpu/received", method = RequestMethod.GET)
|
|
|
- @ApiOperation(value = "查看企业已收货", httpMethod = "GET")
|
|
|
- public Page<Invoice> findEntReceived(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
|
|
|
- logger.log("平台出货单管理", "查看企业已收货");
|
|
|
- PageInfo info = new PageInfo(params);
|
|
|
- info.filter("status", Status.RECEIVED.value());
|
|
|
- info.filter("sellerenuu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
- return invoiceService.findPageByStatus(info, keyword, Type.Invoice_Vender_code.value());
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* 批量查看平台出货单信息
|
|
|
*
|
|
|
@@ -335,22 +317,6 @@ public class InvoiceController {
|
|
|
return invoiceService.findPageByStatus(info, keyword, Type.Invoice_Vender_code.value());
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 查看企业待收货
|
|
|
- *
|
|
|
- * @param params the params 分页参数
|
|
|
- * @param keyword the keyword 搜索字符串
|
|
|
- * @return page 返回Invoice的page对象
|
|
|
- */
|
|
|
- @RequestMapping(value = "/inFpu/inbound", method = RequestMethod.GET)
|
|
|
- @ApiOperation(value = "查看企业待收货", httpMethod = "GET")
|
|
|
- public Page<Invoice> findEntInbound(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
|
|
|
- logger.log("平台出货单管理", "查看企业待收货");
|
|
|
- PageInfo info = new PageInfo(params);
|
|
|
- info.filter("status", Status.INBOUND.value());
|
|
|
- info.filter("sellerenuu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
- return invoiceService.findPageByStatus(info, keyword, Type.Invoice_Vender_code.value());
|
|
|
- }
|
|
|
|
|
|
/**
|
|
|
* 查看已收货
|
|
|
@@ -384,23 +350,6 @@ public class InvoiceController {
|
|
|
return invoiceService.findPageByStatus(info, keyword, Type.Invoice_Vender_code.value());
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 根据卖家企业enuu查看待收款
|
|
|
- *
|
|
|
- * @param params the params 分页参数
|
|
|
- * @param keyword the keyword 搜索字符串
|
|
|
- * @return page 返回InvoiceFPurchase的page对象
|
|
|
- */
|
|
|
- @RequestMapping(value = "/inFpu/toreceivemoney", method = RequestMethod.GET)
|
|
|
- @ApiOperation(value = "根据卖家企业enuu查看待收款", httpMethod = "GET")
|
|
|
- public Page<Invoice> findEntToreceivemoney(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
|
|
|
- logger.log("平台出货单管理", "查看待收款");
|
|
|
- PageInfo info = new PageInfo(params);
|
|
|
- info.filter("status", Status.TORECEIVEMONEY.value());
|
|
|
- info.filter("sellerenuu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
- return invoiceService.findPageByStatus(info, keyword, Type.Invoice_Vender_code.value());
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* 查看已收款
|
|
|
*
|
|
|
@@ -417,23 +366,6 @@ public class InvoiceController {
|
|
|
return invoiceService.findPageByStatus(info, keyword, com.uas.platform.b2c.core.constant.Type.Invoice_Vender_code.value());
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 查看企业已收款
|
|
|
- *
|
|
|
- * @param params the params 分页参数
|
|
|
- * @param keyword the keyword 搜索字符串
|
|
|
- * @return page 返回InvoiceFPurchase的page对象
|
|
|
- */
|
|
|
- @RequestMapping(value = "/inFpu/moneyreceived", method = RequestMethod.GET)
|
|
|
- @ApiOperation(value = "查看企业已收款", httpMethod = "GET")
|
|
|
- public Page<Invoice> findEntMoneyreceived(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
|
|
|
- logger.log("平台出货单管理", "查看企业已收款");
|
|
|
- PageInfo info = new PageInfo(params);
|
|
|
- info.filter("status", Status.MONEYRECEIVED.value());
|
|
|
- info.filter("sellerenuu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
- return invoiceService.findPageByStatus(info, keyword, Type.Invoice_B2c_code.value());
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* 保存出货单信息
|
|
|
*
|