1.提交手持终端保存单据接口

api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountOrderSaveRequest.java

@@ -1,10 +1,10 @@
 package com.glxp.api.admin.req.inventory;
 
 import com.glxp.api.admin.entity.inventory.InvCountCodes;
-import com.glxp.api.admin.entity.inventory.InvCountOrderDetail;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 /**
@@ -19,49 +19,10 @@ public class FilterInvCountOrderSaveRequest {
     @NotBlank(message = "盘点单号为空")
     private String orderId;
 
-    /**
-     * 仓库号
-     */
-    private String invStorageCode;
-
-    /**
-     * 分库号
-     */
-    private String invWarehouseCode;
-
-    /**
-     * 货位号
-     */
-    private String invSpaceCode;
-
-    /**
-     * 盘点用户ID
-     */
-    private String createUser;
-
-    /**
-     * 创建时间
-     */
-    private String createTime;
-
-    /**
-     * 状态 0：未提交 1：未审核 2：已审核
-     */
-    private Integer status;
-
-    /**
-     * 盘点类型，0：整库盘点 1：按货位盘点 2：部分盘点
-     */
-    private Integer countType;
-
-    /**
-     * 单据详情
-     */
-    private List<InvCountOrderDetail> countOrderDetailList;
-
     /**
      * 条码
      */
+    @NotEmpty(message = "盘点产品不能为空")
     private List<InvCountCodes> countCodeList;
 
 }

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java

@@ -26,6 +26,7 @@ import com.glxp.api.admin.req.inventory.FilterInvCountOrderSaveRequest;
 import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest;
 import com.glxp.api.admin.res.inventory.InvCountOrderResponse;
 import com.glxp.api.admin.service.auth.CustomerService;
+import com.glxp.api.admin.service.inventory.InvCountCodesService;
 import com.glxp.api.admin.service.inventory.InvCountOrderService;
 import com.glxp.api.admin.util.*;
 import com.glxp.api.common.enums.ResultEnum;
@@ -68,6 +69,8 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
     private OrderDao orderDao;
     @Resource
     private CodesTempDao codesTempDao;
+    @Resource
+    private InvCountCodesService invCountCodesService;
 
     @Override
     public List<InvCountOrderResponse> filterList(FilterInvCountOrderRequest filterInvCountOrderRequest) {
@@ -210,8 +213,15 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
         if (invCountOrder.getStatus() != 0) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "此单据不可编辑");
         }
-
-        return null;
+        //解析条码，修改单据详情，修改单据状态为待审核
+        invCountOrder.setStatus(1);
+        invCountOrder.setUpdateTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN));
+        List<InvCountCodes> countCodeList = filterInvCountOrderSaveRequest.getCountCodeList();
+        for (InvCountCodes invCountCodes : countCodeList) {
+            invCountCodesService.addCode(invCountCodes);
+        }
+        submitAudit(invCountOrder.getId().toString());
+        return ResultVOUtils.success();
     }
 
     /**