新增UDI管理系统直接验收外网单据相关接口

src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java

@@ -20,14 +20,18 @@ import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
 import com.glxp.api.req.inout.ReviewFinishRequest;
+import com.glxp.api.req.inout.ReviewSpmsRequest;
 import com.glxp.api.req.inout.UpdateExportStatusRequest;
+import com.glxp.api.req.sync.SpsSyncDataRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.inout.AcceptOrderResponse;
 import com.glxp.api.res.inout.IoOrderDetailResultResponse;
+import com.glxp.api.res.sync.SpsSyncOrderResponse;
 import com.glxp.api.service.auth.AuthAdminService;
 import com.glxp.api.service.basic.EntrustReceService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.*;
+import com.glxp.api.service.sync.SpsSyncDownloadService;
 import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.util.CustomUtil;
 import com.glxp.api.util.GennerOrderUtils;
@@ -414,4 +418,30 @@ public class IoOrderReviewController extends BaseController {
         return ResultVOUtils.success("更新成功");
     }
 
+    @Resource
+    SpsSyncDownloadService spsSyncDownloadService;
+
+    //   前端扫单号验收
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/order/reviewSpms")
+    public BaseResponse reviewSpms(@RequestBody ReviewSpmsRequest reviewSpmsRequest) {
+
+        String billNo = reviewSpmsRequest.getBillNo();
+        if (StrUtil.isEmpty(reviewSpmsRequest.getBillNo())) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+
+        IoOrderEntity orderEntity = orderService.findByBillNo(reviewSpmsRequest.getBillNo());
+        if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) {
+            return ResultVOUtils.error(500, "单据已审核!");
+        } else if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) {
+            return ResultVOUtils.error(500, "当前单据不处于待审核状态，无法审核！");
+        }
+        SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest();
+        spsSyncDataRequest.setBillNo(reviewSpmsRequest.getBillNo());
+        return spsSyncDownloadService.findOrder(spsSyncDataRequest);
+
+    }
+
+
 }

src/main/java/com/glxp/api/req/inout/ReviewSpmsRequest.java

@@ -0,0 +1,10 @@
+package com.glxp.api.req.inout;
+
+import lombok.Data;
+
+@Data
+public class ReviewSpmsRequest {
+
+    private String billNo;
+
+}

src/main/java/com/glxp/api/req/sync/SpsSyncDataRequest.java

@@ -6,5 +6,6 @@ import lombok.Data;
 @Data
 public class SpsSyncDataRequest extends ListPageRequest {
 
+    private String billNo;
     private String lastUpdateTime;
 }

src/main/java/com/glxp/api/res/sync/SpsSyncBusResponse.java

@@ -0,0 +1,18 @@
+package com.glxp.api.res.sync;
+
+import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
+import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
+import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SpsSyncBusResponse {
+
+    //同步任务ID
+    private String taskId;
+    private List<BasicBussinessTypeEntity> bussinessTypeEntities;
+    private List<BasicBusTypeChangeEntity> busTypeChangeEntities;
+    private List<ThrBusTypeOriginEntity> thrBusTypeOriginEntities;
+}

src/main/java/com/glxp/api/res/sync/SpsSyncDataResponse.java

@@ -0,0 +1,33 @@
+package com.glxp.api.res.sync;
+
+import com.glxp.api.entity.auth.*;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SpsSyncDataResponse {
+
+    //同步任务ID
+    private String taskId;
+
+    //用户信息
+    List<AuthAdmin> authAdminList;
+    List<InvBusUserEntity> invBusUserEntities;
+
+    //部门信息
+    List<DeptEntity> deptEntityList;
+    List<DeptUserEntity> deptUserEntities;
+
+
+    //仓库相关
+    List<InvWarehouseEntity> invWarehouseEntities;
+    List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities;
+    List<WarehouseUserEntity> warehouseUserEntities;
+
+
+    //货位信息
+    List<InvSpace> invSpaces;
+
+
+}

src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.sync;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BasicProcessStatus;
@@ -76,19 +77,26 @@ public class SpsSyncDownloadService {
 
     public BaseResponse findOrder(SpsSyncDataRequest spsSyncDataRequest) {
         SpsSyncOrderResponse syncOrderResponse = new SpsSyncOrderResponse();
+
         //查询数据同步设置
-        SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet();
         List<IoOrderEntity> orderEntities = new ArrayList<>();
-        FilterOrderRequest orderFilterRequest = new FilterOrderRequest();
-        BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest);
-        if (CollUtil.isNotEmpty(syncDataSetEntity.getBusTypes())) {
-            for (SyncDataBustypeEntity syncDataBustypeEntity : syncDataSetEntity.getBusTypes()) {
-                List<IoOrderEntity> temps = orderService.findByStatus(syncDataBustypeEntity.getAction(), syncDataBustypeEntity.getOrderStatus(), DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
-                if (CollUtil.isNotEmpty(temps)) {
-                    orderEntities.addAll(temps);
+        if (StrUtil.isEmpty(spsSyncDataRequest.getBillNo())) {
+            SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet();
+            FilterOrderRequest orderFilterRequest = new FilterOrderRequest();
+            BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest);
+            if (CollUtil.isNotEmpty(syncDataSetEntity.getBusTypes())) {
+                for (SyncDataBustypeEntity syncDataBustypeEntity : syncDataSetEntity.getBusTypes()) {
+                    List<IoOrderEntity> temps = orderService.findByStatus(syncDataBustypeEntity.getAction(), syncDataBustypeEntity.getOrderStatus(), DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
+                    if (CollUtil.isNotEmpty(temps)) {
+                        orderEntities.addAll(temps);
+                    }
                 }
             }
+        } else {
+            IoOrderEntity orderEntity = orderService.findByBillNo(spsSyncDataRequest.getBillNo());
+            orderEntities.add(orderEntity);
         }
+
         syncOrderResponse.setOrderEntities(orderEntities);
         List<IoCodeEntity> codeEntities = new ArrayList<>();
         List<IoOrderDetailBizEntity> orderDetailBizEntities = new ArrayList<>();

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -156,6 +156,11 @@
                 AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
                         date_format(#{endTime}, '%Y-%m-%d')
             </if>
+            <if test="lastUpdateTime != null and lastUpdateTime != ''">
+                <![CDATA[
+                and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
+            </if>
         </where>
         order by createTime desc
     </select>