new

saicLogistics/src/main/java/com/fuzamei/constant/Role.java

@@ -8,5 +8,5 @@ public class Role {
 	public static final String ADMIN="管理员";
 	public static final String SUPPLIER="供应商";
 	public static final String CARRIER="承运商";
-	public static final String STOCKER="点货员";
+	public static final String STOCKER="仓库收货员";
 }

saicLogistics/src/main/java/com/fuzamei/mapper/CargoConsignMapper.xml

@@ -19,11 +19,11 @@
 		on 
 			o.status_id=s.status_id
 		left join 
-			user u
+			users u
 		on 
 			o.carrier_id=u.user_id
 		<where>
-			o.supplier_id=#{supplierId}
+			o.supplier_id=#{userId}
 			<if test="orderId!=null">
 				and o.order_id=#{orderId}
 			</if>
@@ -47,7 +47,7 @@
 		from 
 			orders
 		<where>
-			supplier_id=#{supplierId}
+			supplier_id=#{userId}
 			<if test="orderId!=null">
 				and order_id=#{orderId}
 			</if>
@@ -125,7 +125,8 @@
 		set
 			transport_time=#{transportTime},
 			status_id=#{statusId},
-			update_time=#{updateTime}
+			update_time=#{updateTime},
+			car_no=#{carNo}
 		where 
 			order_id=#{orderId}
 	</update>

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/CargoConsignServiceImpl.java

@@ -55,6 +55,7 @@ public class CargoConsignServiceImpl implements CargoConsignService {
 		param.setTransportTime(currentTime);
 		param.setUpdateTime(currentTime);
 		param.setStatusId(Status.DELIVERING);
+		param.setCarNo(param.getCarNo());
 		cargoConsignMapper.doCarry(param);
 		//插入【操作记录】
 		param.setOperationTypeId(OperationType.DELIVER);

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/OrdersIssueServiceImpl.java

@@ -118,7 +118,7 @@ public class OrdersIssueServiceImpl implements OrdersIssueService {
 		issueOrder.setStatusName(order.getStatusName());
 		issueOrder.setSupplierName(order.getSupplierName());
 		map.put("issueOrder", issueOrder);
-		if(!Status.UNSEND.equals(order.getStatusName())){
+		if(!Status.UNSEND.equals(order.getStatusId())){
 			SendOrder sendOrder=new SendOrder();
 			sendOrder.setOrderId(order.getOrderId());
 			sendOrder.setBoxNo(order.getBoxNo());
@@ -132,7 +132,7 @@ public class OrdersIssueServiceImpl implements OrdersIssueService {
 			sendOrder.setSupplierName(order.getSupplierName());
 			map.put("sendOrder", sendOrder);
 		}
-		if(Status.DELIVERING.equals(order.getStatusName())||Status.TALLIED.equals(order.getStatusName())||Status.REJECTED.equals(order.getStatusName())){
+		if(Status.DELIVERING.equals(order.getStatusId())||Status.TALLIED.equals(order.getStatusId())||Status.REJECTED.equals(order.getStatusId())){
 			DeliverOrder deliverOrder = new DeliverOrder();
 			deliverOrder.setBoxNo(order.getBoxNo());
 			deliverOrder.setBoxQty(order.getBoxQty());
@@ -145,7 +145,7 @@ public class OrdersIssueServiceImpl implements OrdersIssueService {
 			deliverOrder.setUpdateTime(order.getUpdateTime());
 			map.put("deliverOrder", deliverOrder);
 		}
-		if(Status.TALLIED.equals(order.getStatusName())||Status.REJECTED.equals(order.getStatusName())){
+		if(Status.TALLIED.equals(order.getStatusId())||Status.REJECTED.equals(order.getStatusId())){
 			TallyOrder tallyOrder=new TallyOrder();
 			tallyOrder.setBoxNo(order.getBoxNo());
 			tallyOrder.setBoxQty(order.getBoxQty());

saicLogistics/src/main/java/com/fuzamei/web/CargoConsignAction.java

@@ -133,6 +133,7 @@ public class CargoConsignAction {
 		try {
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.CARRIER);
 			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(param.getOrderId()));
+			ValidationUtil.checkBlankAndAssignString(param.getCarNo());//车牌号校验
 			if(order==null) throw new RuntimeException("订单不存在");
 			if(!Status.UNDELIVER.equals(order.getStatusId())) throw new RuntimeException("非法操作");
 			if(!param.getUserId().equals(order.getCarrierId())) throw new RuntimeException("无权操作");

saicLogistics/src/main/java/com/fuzamei/web/CargoDeliverAction.java

@@ -57,7 +57,7 @@ public class CargoDeliverAction {
 	@RequestMapping(value="/queryOrdersByCarrier",method=RequestMethod.POST)
 	public Map<String, Object> queryOrdersByCarrier(@RequestBody Param param){
 		try {
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.SUPPLIER);
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.CARRIER);
 			int page = ValidationUtil.checkMinAndAssignInt(param.getPage(), 1);
 			Long startTime=ValidationUtil.checkAndAssignDefaultLong(param.getStartTime(), 0L);
 			Long endTime=ValidationUtil.checkAndAssignDefaultLong(param.getEndTime(), Long.MAX_VALUE);

saicLogistics/src/test/java/com/fuzamei/web/CargoConsignActionTest.java

@@ -0,0 +1,76 @@
+package com.fuzamei.web;
+
+import java.util.Map;
+
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.alibaba.fastjson.JSON;
+import com.fuzamei.baseTest.BaseJunit4Test;
+import com.fuzamei.entity.Param;
+
+public class CargoConsignActionTest extends BaseJunit4Test{
+	@Autowired
+	private CargoConsignAction cargoConsignAction;
+	
+	@Test//测试【供应商】查询订单功能
+	public void test01(){
+		Param param=new Param();
+		param.setUserId(9004);
+		param.setPage(1);
+		param.setOrderId(100000001);
+		param.setBoxNo(null);
+		param.setStatusId(null);
+		param.setStartTime(null);
+		param.setEndTime(1516955480353L);
+		Map<String, Object> result = cargoConsignAction.queryOrdersBySupplier(param);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}
+	
+	@Test//测试【承运商】查询订单功能
+	public void test02(){
+		Param param=new Param();
+		param.setUserId(9007);
+		param.setPage(1);
+		param.setOrderId(100000001);
+		param.setBoxNo("sadasa");
+		param.setStatusId(null);
+		param.setStartTime(null);
+		param.setEndTime(1516955480353L);
+		Map<String, Object> result = cargoConsignAction.queryOrdersByCarrier(param);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}
+	
+	@Test//显示所有供应商下的承运商
+	public void test03(){
+		Param param=new Param();
+		param.setUserId(9005);
+		Map<String, Object> result = cargoConsignAction.showAllCarriersUnderSupplier(param);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}
+	
+	@Test//承运操作
+	public void test04(){
+		Param param=new Param();
+		param.setUserId(9007);
+		param.setOrderId(100000001);
+		param.setCarNo("浙A9819Y");
+		Map<String, Object> result = cargoConsignAction.doCarry(param);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}
+	
+	@Test//查看订单跟踪记录
+	public void test05(){
+		Param param=new Param();
+		param.setUserId(9007);
+		param.setOrderId(100000001);
+		Map<String, Object> result = cargoConsignAction.orderTracking(param);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}
+	
+}

saicLogistics/src/test/java/com/fuzamei/web/CargoDeliverActionTest.java

@@ -0,0 +1,44 @@
+package com.fuzamei.web;
+
+import java.util.Map;
+
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.alibaba.fastjson.JSON;
+import com.fuzamei.baseTest.BaseJunit4Test;
+import com.fuzamei.entity.Param;
+
+public class CargoDeliverActionTest extends BaseJunit4Test{
+
+	@Autowired
+	private CargoDeliverAction cargoDeliverAction;
+	
+	@Test//测试【供应商】查询订单功能
+	public void test01(){
+		Param param=new Param();
+		param.setUserId(9007);
+		param.setPage(1);
+		param.setOrderId(100000001);
+		param.setCarNo("浙A9819Y");
+		param.setStatusId(null);
+		param.setStartTime(null);
+		param.setEndTime(1516955480353L);
+		Map<String, Object> result = cargoDeliverAction.queryOrdersByCarrier(param);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}
+	
+	
+	@Test//测试订单跟踪
+	public void test02(){
+		Param param=new Param();
+		param.setUserId(9007);
+		param.setOrderId(100000001);
+		Map<String, Object> result = cargoDeliverAction.orderTracking(param);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}
+	
+	
+}

saicLogistics/src/test/java/com/fuzamei/web/CargoTallyActionTest.java

@@ -0,0 +1,62 @@
+package com.fuzamei.web;
+
+import java.util.Map;
+
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.alibaba.fastjson.JSON;
+import com.fuzamei.baseTest.BaseJunit4Test;
+import com.fuzamei.entity.Param;
+
+public class CargoTallyActionTest extends BaseJunit4Test{
+	
+	@Autowired
+	private CargoTallyAction cargoTallyAction;
+	
+	@Test//收货员查看订单信息
+	public void test01(){
+		Param param=new Param();
+		param.setUserId(9011);
+		param.setPage(1);
+		param.setOrderId(100000001);
+		param.setCarNo(null);
+		param.setStartTime(null);
+		param.setEndTime(null);
+		Map<String, Object> result = cargoTallyAction.queryOrdersByReceiver(param);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}
+	
+	@Test//点击下一步查看订单信息
+	public void test02(){
+		Param param=new Param();
+		param.setUserId(9011);
+		param.setOrderId(100000001);
+		Map<String, Object> result = cargoTallyAction.searchNewOrderByOrderId(param);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}
+	
+	@Test//查看订单跟踪信息
+	public void test03(){
+		Param param=new Param();
+		param.setUserId(9012);
+		param.setOrderId(100000001);
+		Map<String, Object> result = cargoTallyAction.orderTracking(param);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}
+	
+	@Test//收货员点击收货或者拒收
+	public void test04(){
+		Param param=new Param();
+		param.setUserId(9012);
+		param.setOrderId(100000001);
+		param.setConfirmId(1);
+		Map<String, Object> result = cargoTallyAction.confirmOrReject(param);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}
+	
+}

saicLogistics/src/test/java/com/fuzamei/web/OrdersIssueActionTest.java

@@ -84,13 +84,23 @@ public class OrdersIssueActionTest extends BaseJunit4Test{
 	@Test//测试订单跟踪信息
 	public void test06(){
 		Param param=new Param();
-		param.setUserId(9003);
+		param.setUserId(9001);
 		param.setOrderId(100000001);
 		Map<String, Object> result = ordersIssueAction.orderTracking(param);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
 	
+	@Test//测试订单发货
+	public void test07(){
+		Param param=new Param();
+		param.setUserId(9003);
+		param.setOrderId(100000001);
+		param.setCarrierId(9007);
+		Map<String, Object> result = ordersIssueAction.consignment(param);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}