出货单url替换。

src/main/java/com/uas/platform/b2c/logistics/controller/InvoiceController.java

@@ -63,7 +63,7 @@ public class InvoiceController {
 	 * @param orid the orid 订单号
 	 * @return InvoiceFOrder 返回InvoiceFOrder对象
 	 */
-	@RequestMapping(value = "/create/{orid}/order", method = RequestMethod.PUT)
+	@RequestMapping(value = "/inFor/create/{orid}/order", method = RequestMethod.PUT)
 	@ApiOperation(value = "订单转出货", httpMethod = "PUT")
 	public Invoice send(@ApiParam(required = true, value = "订单id") @PathVariable Long orid) {
 		logger.log("客户出货单信息管理", "转出货", "转出货的订单id=" + orid + ",操作人：" + SystemSession.getUser().getUserUU() + "-" + SystemSession.getUser().getUserName());
@@ -76,7 +76,7 @@ public class InvoiceController {
 	 * @param inid the inid 发货单号
 	 * @return InvoiceFOrder 返回InvoiceFOrder对象
 	 */
-	@RequestMapping(value = "/{inid}/send", method = RequestMethod.PUT)
+	@RequestMapping(value = "/inFor/{inid}/send", method = RequestMethod.PUT)
 	@ApiOperation(value = "平台发货", httpMethod = "PUT")
 	public Invoice sendorder(@ApiParam(required = true, value = "发货单号") @PathVariable String inid) {
 		logger.log("客户出货单信息管理", "平台发货", "平台发货的流水号:" + inid + ",操作人：" + SystemSession.getUser().getUserUU() + "-" +SystemSession.getUser().getUserName());
@@ -91,7 +91,7 @@ public class InvoiceController {
 	 * @param status  the status 状态
 	 * @return page 返回InvoiceFOrder的page对象
 	 */
-	@RequestMapping(value = "/admin", method = RequestMethod.GET)
+	@RequestMapping(value = "/inFor/admin", method = RequestMethod.GET)
 	@ApiOperation(value = "平台根据状态查看卖家出货单", httpMethod = "GET")
 	public Page<Invoice> findAdminInFor(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword, @ApiParam(required = true, value = "出货单状态") String status) {
 		logger.log("客户出货单信息管理", "平台根据状态查看卖家出货单");
@@ -106,7 +106,7 @@ public class InvoiceController {
 	 * @param keyword the keyword 搜索字符串
 	 * @return page 返回InvoiceFOrder的page对象
 	 */
-	@RequestMapping(value = "/tobeshipped", method = RequestMethod.GET)
+	@RequestMapping(value = "/inFor/tobeshipped", method = RequestMethod.GET)
 	@ApiOperation(value = "查看待出货状态出货单", httpMethod = "GET")
 	public Page<Invoice> findToBeShipped(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
 		logger.log("客户出货单信息管理", "查看待出货");
@@ -122,7 +122,7 @@ public class InvoiceController {
 	 * @param keyword the keyword 搜索字符串
 	 * @return page 返回InvoiceFOrder的page对象
 	 */
-	@RequestMapping(value = "/inbound", method = RequestMethod.GET)
+	@RequestMapping(value = "/inFor/inbound", method = RequestMethod.GET)
 	@ApiOperation(value = "查看待收货状态出货单", httpMethod = "GET")
 	public Page<Invoice> findInbound(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
 		logger.log("客户出货单信息管理", "查看待收货");
@@ -138,7 +138,7 @@ public class InvoiceController {
 	 * @param keyword the keyword 搜索字符串
 	 * @return page 返回InvoiceFOrder的page对象
 	 */
-	@RequestMapping(value = "/received", method = RequestMethod.GET)
+	@RequestMapping(value = "/inFor/received", method = RequestMethod.GET)
 	@ApiOperation(value = "查看已收货状态出货单", httpMethod = "GET")
 	public Page<Invoice> findReceived(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
 		logger.log("客户出货单信息管理", "查看已收货");
@@ -154,7 +154,7 @@ public class InvoiceController {
 	 * @param keyword the keyword 搜索字符串
 	 * @return page 返回InvoiceFOrder的page对象
 	 */
-	@RequestMapping(value = "/paid", method = RequestMethod.GET)
+	@RequestMapping(value = "/inFor/paid", method = RequestMethod.GET)
 	@ApiOperation(value = "查看已付款状态出货单", httpMethod = "GET")
 	public Page<Invoice> findPaid(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
 		logger.log("客户出货单信息管理", "查看已付款");
@@ -182,7 +182,7 @@ public class InvoiceController {
 	 * @param postDate 所有转出货单的订单map集合
 	 * @return string 返回success
 	 */
-	@RequestMapping(value = "/batch/create", method = RequestMethod.POST)
+	@RequestMapping(value = "/inFor/batch/create", method = RequestMethod.POST)
 	@ApiOperation(value = "平台收货后，订单转出货单", httpMethod = "POST")
 	public String convertInvoiceFOrder(@ApiParam(required = true, value = "所有转出货单的订单map集合") @RequestBody String postDate) {
 		JSONObject jsonObject = FastjsonUtils.parseObject(postDate);
@@ -199,7 +199,7 @@ public class InvoiceController {
 	 * @id 买家订单主键
 	 * @return string 返回success
 	 */
-	@RequestMapping(value = "/ship", method = RequestMethod.POST)
+	@RequestMapping(value = "/inFor/ship", method = RequestMethod.POST)
 	public ResultMap orderShip(@RequestBody String json, Long id) {
 		return invoiceService.orderShip(json, id);
 	}
@@ -211,7 +211,7 @@ public class InvoiceController {
 	 * @param json 请求体的信息
 	 * @return string 返回success
 	 */
-	@RequestMapping(value = "/batch/send", method = RequestMethod.PUT)
+	@RequestMapping(value = "/inFor/batch/send", method = RequestMethod.PUT)
 	public String batchOrSingleFOrSend(@RequestBody String json) {
 		try {
 			invoiceService.batchOrSingleFOrSend(json);
@@ -295,7 +295,7 @@ public class InvoiceController {
      * @param keyword the keyword 搜索字符串
      * @return page 返回InvoiceFPurchase的page对象
      */
-    @RequestMapping(value = "/inFpu/enterprise/tobeshipped", method = RequestMethod.GET)
+    @RequestMapping(value = "/inFpu/tobeshipped", method = RequestMethod.GET)
     @ApiOperation(value = "查看企业待出货", httpMethod = "GET")
     public Page<Invoice> findEntToBeShipped(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
         logger.log("平台出货单管理", "查看企业待出货");
@@ -312,7 +312,7 @@ public class InvoiceController {
      * @param keyword the keyword 搜索字符串
      * @return page 返回InvoiceFPurchase的page对象
      */
-    @RequestMapping(value = "/inFpu/enterprise/received", method = RequestMethod.GET)
+    @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("平台出货单管理", "查看企业已收货");
@@ -358,7 +358,7 @@ public class InvoiceController {
      * @param keyword the keyword 搜索字符串
      * @return page 返回Invoice的page对象
      */
-    @RequestMapping(value = "/inFpu/enterprise/inbound", method = RequestMethod.GET)
+    @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("平台出货单管理", "查看企业待收货");
@@ -407,7 +407,7 @@ public class InvoiceController {
      * @param keyword the keyword 搜索字符串
      * @return page 返回InvoiceFPurchase的page对象
      */
-    @RequestMapping(value = "/inFpu/enterprise/toreceivemoney", method = RequestMethod.GET)
+    @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("平台出货单管理", "查看待收款");
@@ -440,7 +440,7 @@ public class InvoiceController {
      * @param keyword the keyword 搜索字符串
      * @return page 返回InvoiceFPurchase的page对象
      */
-    @RequestMapping(value = "/inFpu/enterprise/moneyreceived", method = RequestMethod.GET)
+    @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("平台出货单管理", "查看企业已收款");

src/main/java/com/uas/platform/b2c/logistics/service/impl/InvoiceServiceImpl.java

@@ -90,7 +90,8 @@ public class InvoiceServiceImpl implements InvoiceService {
 
     private final InOutboundDetailService inOutboundDetailService;
 
-    private final CommodityInOutboundService commodityInOutboundService;
+    @Autowired
+    private CommodityInOutboundService commodityInOutboundService;
 
     @Autowired
     private PurchaseDao purchaseDao;
@@ -104,7 +105,7 @@ public class InvoiceServiceImpl implements InvoiceService {
     private final LogisticsOldService logisticsService;
 
     @Autowired
-    public InvoiceServiceImpl(InvoiceDao invoiceDao, InvoiceFPurchaseDao invoiceFPurchaseDao, InvoiceFOrderDao invoiceFOrderDao, OrderDao orderDao, CreateNumberService createNumberService, LogisticsPortService logisticsPortservice, SysConf sysConf, EnterpriseService enterpriseService, InOutboundDetailService inOutboundDetailService, CommodityInOutboundService commodityInOutboundService, EnterpriseDao enterpriseDao, ProductService productService, GoodsService goodsService, LogisticsOldService logisticsService) {
+    public InvoiceServiceImpl(InvoiceDao invoiceDao, InvoiceFPurchaseDao invoiceFPurchaseDao, InvoiceFOrderDao invoiceFOrderDao, OrderDao orderDao, CreateNumberService createNumberService, LogisticsPortService logisticsPortservice, SysConf sysConf, EnterpriseService enterpriseService, InOutboundDetailService inOutboundDetailService, EnterpriseDao enterpriseDao, ProductService productService, GoodsService goodsService, LogisticsOldService logisticsService) {
         this.invoiceDao = invoiceDao;
         this.invoiceFPurchaseDao = invoiceFPurchaseDao;
         this.invoiceFOrderDao = invoiceFOrderDao;
@@ -114,7 +115,6 @@ public class InvoiceServiceImpl implements InvoiceService {
         this.sysConf = sysConf;
         this.enterpriseService = enterpriseService;
         this.inOutboundDetailService = inOutboundDetailService;
-        this.commodityInOutboundService = commodityInOutboundService;
         this.enterpriseDao = enterpriseDao;
         this.productService = productService;
         this.goodsService = goodsService;

src/main/webapp/resources/js/common/query/invoice.js

@@ -7,13 +7,13 @@ define([ 'ngResource' ], function() {
 			 */
 			//平台查看待出货详情
 			tobeshippedByInvoiceid : {
-				url : 'trade/inFpu/tobeshipped/:ids',
+				url : 'trade/invoice/inFpu/tobeshipped/:ids',
 				method : 'GET',
 				isArray : true
 			},
 			//平台根据状态查看出货单
 			getAdminInFpu : {
-				url : 'trade/inFpu/admin',
+				url : 'trade/invoice/inFpu/admin',
 				method : 'GET'	
 			},
 			
@@ -22,7 +22,7 @@ define([ 'ngResource' ], function() {
 			 */
 			//企业卖家根据状态查看单据
 			getBusinessInvoice : {
-				url : 'trade/inFpu/business',
+				url : 'trade/invoice/inFpu/business',
 				method : 'GET'
 			},
 			
@@ -35,7 +35,7 @@ define([ 'ngResource' ], function() {
 			 * 根据id查看发货单
 			 */
 			getInvoiceFOrder : {
-				url : 'trade/inFor/:inid/find',
+				url : 'trade/invoice/:inid/find',
 				method : 'GET'
 			},
 			//平台收货
@@ -59,12 +59,12 @@ define([ 'ngResource' ], function() {
 			},
 			
 			saveInvoiceFPurchase : {
-				url : 'trade/inFpu/save',
+				url : 'trade/invoice/inFpu/save',
 				method : 'POST'
 			},
 			// 根据出货单id获取出货单
 			getInvoiceFPu : {
-				url : 'trade/inFpu/:id/getIn',
+				url : '/trade/invoice/:invoiceid/code',
 				method : 'GET'
 			}
 		});
@@ -75,22 +75,22 @@ define([ 'ngResource' ], function() {
 			 */
 			//平台根据状态查看平台出货单
 			getAdminInFor : {
-				url : 'trade/inFor/admin',
+				url : 'trade/invoice/inFor/admin',
 				method : 'GET'	
 			},
 			//平台出货
 			send : {
-				url : 'trade/inFor/:inid/send',
+				url : 'trade/invoice/inFor/:inid/send',
 				method : 'PUT'
 			},
 			//平台单个出货和批量出货共用方法
 			batchSend : {
-				url : 'trade/inFor/batch/send',
+				url : 'trade/invoice/inFor/batch/send',
 				method : 'PUT'
 			},
 			//根据出货单号查看出货单
 			getInvoiceFOrder: {
-				url : 'trade/inFor/:invoiceid/code',
+				url : 'trade/invoice/:invoiceid/code',
 				method : 'GET'
 			},
 			// 根据批次号获取标准元器件信息 

src/main/webapp/resources/js/common/query/order.js

@@ -134,12 +134,12 @@ define([ 'ngResource' ], function() {
              */
             //转出货
             createinFor: {
-                url : 'trade/inFor/create/:orid',
+                url : 'trade/invoice/inFor/create/:orid/order',
                 method : 'PUT'
             },
             //批量转出货单
             batchCreateinFor: {
-                url: 'trade/inFor/batch/create',
+                url: 'trade/invoice/inFor/batch/create',
                 method : 'POST'
             },
             /**