new

saicLogistics/src/main/java/com/fuzamei/constant/Status.java → saicLogistics/src/main/java/com/fuzamei/constant/Statuses.java

@@ -3,8 +3,8 @@ package com.fuzamei.constant;
 import java.util.Arrays;
 import java.util.List;
 
-public class Status {
-	private Status() {
+public class Statuses {
+	private Statuses() {
 		throw new AssertionError("禁止实例化");
 	}
 	public static final Integer UNSEND = 1;			//待发货

saicLogistics/src/main/java/com/fuzamei/entity/Status.java

@@ -1,7 +1,7 @@
 package com.fuzamei.entity;
 /**
  * 
- * @className:Status[状态实体类]
+ * @className:Statu[状态实体类]
  * @author:ylx--->[yanglingxiao2009@163.com]
  * @date:2018年1月24日下午7:39:29
  * @version v1.0

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

@@ -24,10 +24,11 @@
 			o.carrier_id=u.user_id
 		<where>
 			o.supplier_id=#{userId}
+			and o.status_id not in (1)
 			<if test="orderId!=null">
 				and o.order_id=#{orderId}
 			</if>
-			<if test="boxNo!=null">
+			<if test="boxNo!=null and boxNo!=''">
 				and o.box_no=#{boxNo}
 			</if>
 			<if test="statusId!=null">
@@ -48,6 +49,7 @@
 			orders
 		<where>
 			supplier_id=#{userId}
+			and o.status_id not in (1)
 			<if test="orderId!=null">
 				and order_id=#{orderId}
 			</if>
@@ -80,6 +82,7 @@
 			o.status_id=s.status_id
 		<where>
 			o.carrier_id=#{userId}
+			and o.status_id not in (1,2)
 			<if test="orderId!=null">
 				and o.order_id=#{orderId}
 			</if>
@@ -103,7 +106,8 @@
 		from 
 			orders
 		<where>
-			carrier_id=#{carrierId}
+			carrier_id=#{userId}
+			and o.status_id not in (1,2)
 			<if test="orderId!=null">
 				and order_id=#{orderId}
 			</if>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace = "com.fuzamei.mapperInterface.StatusMapper">
+	
+	<select id="queryAllStatusInformation" resultType="Status">
+		select * from status
+	</select>
+</mapper>

saicLogistics/src/main/java/com/fuzamei/mapperInterface/PartMapper.java

@@ -3,6 +3,7 @@ package com.fuzamei.mapperInterface;
 import java.util.List;
 
 import com.fuzamei.entity.Part;
+import com.fuzamei.entity.Status;
 
 public interface PartMapper {
 
@@ -10,4 +11,5 @@ public interface PartMapper {
 
 	List<Part> queryAllPartInformation();
 
+
 }

saicLogistics/src/main/java/com/fuzamei/mapperInterface/StatusMapper.java

@@ -0,0 +1,11 @@
+package com.fuzamei.mapperInterface;
+
+import java.util.List;
+
+import com.fuzamei.entity.Status;
+
+public interface StatusMapper {
+
+	List<Status> queryAllStatusInformation();
+
+}

saicLogistics/src/main/java/com/fuzamei/service/PartService.java

@@ -3,6 +3,7 @@ package com.fuzamei.service;
 import java.util.List;
 
 import com.fuzamei.entity.Part;
+import com.fuzamei.entity.Status;
 
 public interface PartService {
 	

saicLogistics/src/main/java/com/fuzamei/service/StatusService.java

@@ -0,0 +1,11 @@
+package com.fuzamei.service;
+
+import java.util.List;
+
+import com.fuzamei.entity.Status;
+
+public interface StatusService {
+
+	List<Status> queryAllStatusInformation();
+
+}

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

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.fuzamei.constant.OperationType;
-import com.fuzamei.constant.Status;
+import com.fuzamei.constant.Statuses;
 import com.fuzamei.entity.IssueOrder;
 import com.fuzamei.entity.Orders;
 import com.fuzamei.entity.Params;
@@ -54,7 +54,7 @@ public class CargoConsignServiceImpl implements CargoConsignService {
 		//更新【订单表】
 		params.setTransportTime(currentTime);
 		params.setUpdateTime(currentTime);
-		params.setStatusId(Status.DELIVERING);
+		params.setStatusId(Statuses.DELIVERING);
 		params.setCarNo(params.getCarNo());
 		cargoConsignMapper.doCarry(params);
 		//插入【操作记录】

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

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.fuzamei.constant.OperationType;
-import com.fuzamei.constant.Status;
+import com.fuzamei.constant.Statuses;
 import com.fuzamei.entity.Orders;
 import com.fuzamei.entity.Params;
 import com.fuzamei.entity.SendOrder;
@@ -55,8 +55,8 @@ public class CargoTallyServiceImpl implements CargoTallyService {
 		params.setTallyTime(currentTime);
 		params.setUpdateTime(currentTime);
 		params.setReceiverId(params.getUserId());
-		if(params.getConfirmId()==1)	params.setStatusId(Status.TALLIED);
-		if(params.getConfirmId()==0)	params.setStatusId(Status.REJECTED);
+		if(params.getConfirmId()==1)	params.setStatusId(Statuses.TALLIED);
+		if(params.getConfirmId()==0)	params.setStatusId(Statuses.REJECTED);
 		cargoTallyMapper.confirmOrReject(params);
 		//插入【操作记录】
 		if(params.getConfirmId()==1) params.setOperationTypeId(OperationType.CONFIRM);

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

@@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.fuzamei.constant.OperationType;
 import com.fuzamei.constant.Role;
-import com.fuzamei.constant.Status;
+import com.fuzamei.constant.Statuses;
 import com.fuzamei.entity.DeliverOrder;
 import com.fuzamei.entity.IssueOrder;
 import com.fuzamei.entity.Orders;
@@ -59,7 +59,7 @@ public class OrdersIssueServiceImpl implements OrdersIssueService {
 		//更新【订单表】
 		params.setSendTime(currentTime);
 		params.setUpdateTime(currentTime);
-		params.setStatusId(Status.UNDELIVER);//待运输状态
+		params.setStatusId(Statuses.UNDELIVER);//待运输状态
 		ordersIssueMapper.consignment(params);
 		//插入【操作记录】
 		params.setOperationTypeId(OperationType.SEND);
@@ -78,7 +78,7 @@ public class OrdersIssueServiceImpl implements OrdersIssueService {
 		params.setCreateTime(currentTime);
 		params.setUpdateTime(currentTime);
 		params.setBoxQty(1);//暂时将箱子数量设置为1=======================>>TODO
-		params.setStatusId(Status.UNSEND);
+		params.setStatusId(Statuses.UNSEND);
 		ordersIssueMapper.addOrder(params);
 		//插入【操作记录】
 		params.setOperationTypeId(OperationType.ADD_ORDER);
@@ -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.getStatusId())){
+		if(!Statuses.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.getStatusId())||Status.TALLIED.equals(order.getStatusId())||Status.REJECTED.equals(order.getStatusId())){
+		if(Statuses.DELIVERING.equals(order.getStatusId())||Statuses.TALLIED.equals(order.getStatusId())||Statuses.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.getStatusId())||Status.REJECTED.equals(order.getStatusId())){
+		if(Statuses.TALLIED.equals(order.getStatusId())||Statuses.REJECTED.equals(order.getStatusId())){
 			TallyOrder tallyOrder=new TallyOrder();
 			tallyOrder.setBoxNo(order.getBoxNo());
 			tallyOrder.setBoxQty(order.getBoxQty());

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

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.fuzamei.entity.Part;
+import com.fuzamei.entity.Status;
 import com.fuzamei.mapperInterface.PartMapper;
 import com.fuzamei.service.PartService;
 
@@ -26,4 +27,5 @@ public class PartServiceImpl implements PartService {
 		return partMapper.queryAllPartInformation();
 	}
 
+
 }

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

@@ -0,0 +1,22 @@
+package com.fuzamei.service.serviceImpl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.fuzamei.entity.Status;
+import com.fuzamei.mapperInterface.StatusMapper;
+import com.fuzamei.service.StatusService;
+@Service
+public class StatusServiceImpl implements StatusService {
+	
+	@Autowired
+	private StatusMapper statusMapper;
+	
+	@Override
+	public List<Status> queryAllStatusInformation() {
+		return statusMapper.queryAllStatusInformation();
+	}
+
+}

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

@@ -14,12 +14,14 @@ import org.springframework.web.bind.annotation.RestController;
 import com.fuzamei.constant.HintMSG;
 import com.fuzamei.constant.RegexConstant;
 import com.fuzamei.constant.Role;
-import com.fuzamei.constant.Status;
+import com.fuzamei.constant.Statuses;
 import com.fuzamei.entity.Orders;
 import com.fuzamei.entity.Params;
+import com.fuzamei.entity.Status;
 import com.fuzamei.entity.UserDetail;
 import com.fuzamei.service.CargoConsignService;
 import com.fuzamei.service.OrderService;
+import com.fuzamei.service.StatusService;
 import com.fuzamei.service.UserAuthoricationService;
 import com.fuzamei.util.JSONUtil;
 import com.fuzamei.util.PageDTO;
@@ -39,6 +41,9 @@ public class CargoConsignAction {
 	@Autowired
 	private OrderService orderService;
 	
+	@Autowired
+	private StatusService statusService;
+	
 	@Autowired
 	private HttpServletRequest req;
 	
@@ -67,6 +72,7 @@ public class CargoConsignAction {
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.SUPPLIER);
+			params.setUserId(Integer.parseInt(userId));
 			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
 			int rowNum=ValidationUtil.checkMinAndAssignInt(params.getRowNum(), 1);
 			Long startTime=ValidationUtil.checkAndAssignDefaultLong(params.getStartTime(), 0L);
@@ -107,6 +113,7 @@ public class CargoConsignAction {
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.CARRIER);
+			params.setUserId(Integer.parseInt(userId));
 			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
 			int rowNum=ValidationUtil.checkMinAndAssignInt(params.getRowNum(), 1);
 			Long startTime=ValidationUtil.checkAndAssignDefaultLong(params.getStartTime(), 0L);
@@ -146,7 +153,7 @@ public class CargoConsignAction {
 			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			ValidationUtil.checkBlankAndAssignString(params.getCarNo());//车牌号校验
 			if(order==null) throw new RuntimeException("订单不存在");
-			if(!Status.UNDELIVER.equals(order.getStatusId())) throw new RuntimeException("非法操作");
+			if(!Statuses.UNDELIVER.equals(order.getStatusId())) throw new RuntimeException("非法操作");
 			if(!params.getUserId().equals(order.getCarrierId())) throw new RuntimeException("无权操作");
 			cargoConsignService.doCarry(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS, null);
@@ -183,6 +190,30 @@ public class CargoConsignAction {
 	}
 	
 	
+	
+	/**
+	 * 
+	* @Title: showAllStatus
+	* @Description: TODO(返回给前端所有状态的id和状态名称)
+	* @param @return    设定文件
+	* @return Map<String,Object>    返回类型
+	* @author ylx
+	* @date 2018年1月31日 下午4:16:11
+	* @throws
+	 */
+	@RequestMapping(value="/showAllStatus",method=RequestMethod.POST)
+	public Map<String, Object> showAllStatus(){
+		try {
+			String userId = req.getHeader("Authorization").split("&")[1];
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.SUPPLIER,Role.CARRIER);//检测当前操作用户权限
+			List<Status> statusList = statusService.queryAllStatusInformation();
+			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, statusList);
+		} catch (Exception e) {
+			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
+		}
+	}
+	
+	
 	/**
 	 * 
 	* @Title: orderTracking

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.fuzamei.constant.HintMSG;
 import com.fuzamei.constant.Role;
-import com.fuzamei.constant.Status;
+import com.fuzamei.constant.Statuses;
 import com.fuzamei.entity.Orders;
 import com.fuzamei.entity.Params;
 import com.fuzamei.entity.TallyOrder;
@@ -100,7 +100,7 @@ public class CargoTallyAction {
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.STOCKER);
 			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(order==null) throw new RuntimeException("订单不存在");
-			if(!Status.DELIVERING.equals(order.getStatusId())) throw new RuntimeException("非法操作");
+			if(!Statuses.DELIVERING.equals(order.getStatusId())) throw new RuntimeException("非法操作");
 			params.setOrder(order);
 			TallyOrder tallyOrder=cargoTallyService.searchNewOrderByOrderId(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, tallyOrder);
@@ -132,7 +132,7 @@ public class CargoTallyAction {
 			ValidationUtil.checkRangeAndAssignInt(params.getConfirmId(), 0, 1);//确认id只能是0和1
 			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(order==null) throw new RuntimeException("订单不存在");
-			if(!Status.DELIVERING.equals(order.getStatusId())) throw new RuntimeException("非法操作");
+			if(!Statuses.DELIVERING.equals(order.getStatusId())) throw new RuntimeException("非法操作");
 			cargoTallyService.confirmOrReject(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS, null);
 		} catch (Exception e) {

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

@@ -15,16 +15,18 @@ import org.springframework.web.bind.annotation.RestController;
 import com.fuzamei.constant.HintMSG;
 import com.fuzamei.constant.RegexConstant;
 import com.fuzamei.constant.Role;
-import com.fuzamei.constant.Status;
+import com.fuzamei.constant.Statuses;
 import com.fuzamei.entity.Box;
 import com.fuzamei.entity.Orders;
 import com.fuzamei.entity.Params;
 import com.fuzamei.entity.Part;
+import com.fuzamei.entity.Status;
 import com.fuzamei.entity.UserDetail;
 import com.fuzamei.service.BoxService;
 import com.fuzamei.service.OrderService;
 import com.fuzamei.service.OrdersIssueService;
 import com.fuzamei.service.PartService;
+import com.fuzamei.service.StatusService;
 import com.fuzamei.service.UserAuthoricationService;
 import com.fuzamei.util.JSONUtil;
 import com.fuzamei.util.PageDTO;
@@ -50,6 +52,8 @@ public class OrdersIssueAction {
 	@Autowired
 	private PartService partService;
 	
+
+	
 	private static final String ORDER_ID_PATTERN=RegexConstant.ORDER_ID;
 	
 	@Autowired
@@ -156,7 +160,7 @@ public class OrdersIssueAction {
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getCarrierId()), Role.CARRIER);
 			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(order==null) throw new RuntimeException("订单不存在");
-			if(!Status.UNSEND.equals(order.getStatusId())) throw new RuntimeException(HintMSG.ILLEGAL);
+			if(!Statuses.UNSEND.equals(order.getStatusId())) throw new RuntimeException(HintMSG.ILLEGAL);
 			if(!params.getUserId().equals(order.getSupplierId())) throw new RuntimeException(HintMSG.NO_AUTH);
 			ordersIssueService.consignment(params);
 			return JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS, null);
@@ -222,7 +226,7 @@ public class OrdersIssueAction {
 	* @throws
 	 */
 	@RequestMapping(value="/showSuppliersUnderPlanner",method=RequestMethod.POST)
-	public Map<String, Object> showSuppliersUnderPlanner(@RequestBody Params params){
+	public Map<String, Object> showSuppliersUnderPlanner(){
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			UserDetail userDetail = userAuthoricationService.queryUserDetail(ValidationUtil.checkAndAssignInt(userId), Role.PLANNER);//检测当前操作用户权限
@@ -272,7 +276,7 @@ public class OrdersIssueAction {
 	* @throws
 	 */
 	@RequestMapping(value="/showAllPartNo",method=RequestMethod.POST)
-	public Map<String, Object> showAllPartNo(@RequestBody Params params){
+	public Map<String, Object> showAllPartNo(){
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.PLANNER);//检测当前操作用户权限
@@ -283,6 +287,8 @@ public class OrdersIssueAction {
 		}
 	}
 	
+	
+	
 	/**
 	 * 
 	* @Title: orderTracking

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

@@ -67,7 +67,7 @@ public class OrdersIssueActionTest extends BaseJunit4Test{
 	public void test04(){
 		Params Params=new Params();
 		Params.setUserId(9001);
-		Map<String, Object> result = ordersIssueAction.showSuppliersUnderPlanner(Params);
+		Map<String, Object> result = ordersIssueAction.showSuppliersUnderPlanner();
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
@@ -76,7 +76,7 @@ public class OrdersIssueActionTest extends BaseJunit4Test{
 	public void test05(){
 		Params Params=new Params();
 		Params.setUserId(9001);
-		Map<String, Object> result = ordersIssueAction.showAllPartNo(Params);
+		Map<String, Object> result = ordersIssueAction.showAllPartNo();
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}