|
|
@@ -21,8 +21,6 @@ import com.goafanti.order.bo.InputTChangeTask;
|
|
|
import com.goafanti.order.bo.NewOrderChangeBo;
|
|
|
import com.goafanti.order.service.OrderChangeService;
|
|
|
|
|
|
-import java.util.List;
|
|
|
-
|
|
|
@RestController
|
|
|
@RequestMapping(value = "/api/admin/orderChange")
|
|
|
public class OrderChangeApiController extends CertifyApiController {
|
|
|
@@ -290,6 +288,7 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
* @param timeType
|
|
|
* @param startTime
|
|
|
* @param endTime
|
|
|
+ * @param depId
|
|
|
* @param salesmanName
|
|
|
* @param complete
|
|
|
* @param orderNo
|
|
|
@@ -384,6 +383,12 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError("订单编号和类型不能为空", "订单编号和类型不能为空"));
|
|
|
return res;
|
|
|
}
|
|
|
+ if (orderChangeService.checkChangeId(nb.getId())){
|
|
|
+ StringBuffer str=new StringBuffer("操作异常");
|
|
|
+ str=str.append("[").append(nb.getId()).append("]").append("编号变更已经完成");
|
|
|
+ res.getError().add(buildError(str.toString(), str.toString()));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
res.data(orderChangeService.pushCompleteOrderChange(nb));
|
|
|
return res;
|
|
|
}
|