Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/purchase/PurOrderController.java

@@ -1,6 +1,5 @@
 package com.glxp.api.controller.purchase;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
@@ -11,9 +10,10 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.entity.basic.BasicCorpEntity;
-import com.glxp.api.entity.inv.InvProductDetailEntity;
-import com.glxp.api.entity.purchase.*;
-import com.glxp.api.req.inv.FilterInvProductDetailRequest;
+import com.glxp.api.entity.purchase.PurApplyEntity;
+import com.glxp.api.entity.purchase.PurOrderDetailEntity;
+import com.glxp.api.entity.purchase.PurOrderEntity;
+import com.glxp.api.entity.purchase.PurPlanDetailEntity;
 import com.glxp.api.req.purchase.PostPurOrderRequest;
 import com.glxp.api.req.purchase.PurOrderDetailRequest;
 import com.glxp.api.req.purchase.PurOrderRequest;
@@ -79,6 +79,9 @@ public class PurOrderController {
     @PostMapping("/purchase/order/postOrder")
     public BaseResponse postOrder(@RequestBody PostPurOrderRequest postPurOrderRequest) {
 
+        if(postPurOrderRequest.getPurOrderEntity().getArrivalTime().compareTo(postPurOrderRequest.getPurOrderEntity().getCreateTime())==-1){
+            return  ResultVOUtils.error(999,"到货时间不能小于创建时间!");
+        }
         Long userId = customerService.getUserId();
         PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity();
         Long id = purOrderEntity.getId();