10/31 上货工位增加货位

src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
@@ -286,20 +287,30 @@ public class IoCollectOrderCodeManController extends BaseController {
     public BaseResponse removeByScanCode(@RequestBody @Valid DeleteTageCodeRequest deleteTageCodeRequest,
                                          BindingResult bindingResult) {
         //codes orderId
+        //todo 重复条码
         String orderId = deleteTageCodeRequest.getOrderId();
         IoCollectOrder ioCollectOrder = collectOrderService.getByBillNo(orderId);
+        StringBuilder messages = new StringBuilder(); // 用于存储重复条码
         if (ioCollectOrder == null)
             return ResultVOUtils.error(500, "单据不存在");
         if (CollUtil.isNotEmpty(deleteTageCodeRequest.getCodeList())) {
             List<IoCollectOrderCodeMan> ioCollectOrderCodes = collectOrderCodeManService.selectByCodeAndOrderId(deleteTageCodeRequest.getCodeList(), orderId);
+            if (ioCollectOrderCodes.size() == 0){
+                return ResultVOUtils.error("无效条码");
+            }
             for (IoCollectOrderCodeMan ioCollectOrderCode : ioCollectOrderCodes) {
                 deleteTageCodeRequest.setDelType(1);
                 deleteTageCodeRequest.setCodeManId(Long.valueOf(ioCollectOrderCode.getId()));
                 collectOrderService.removeCode(deleteTageCodeRequest);
             }
-        } else
+        }
+        else
             return ResultVOUtils.error("无效条码");
-        return ResultVOUtils.success("剔除成功!");
+        if (StrUtil.isEmpty(messages)){
+            return ResultVOUtils.success("剔除成功!");
+        }
+        else
+            return ResultVOUtils.error(501,messages.toString());
     }
 
 }

src/main/java/com/glxp/api/entity/auth/SysWorkplace.java

@@ -106,6 +106,13 @@ public class SysWorkplace implements Serializable {
     @TableField(value = "workplaceClass")
     private Integer workPlaceClass;
 
+    /**
+     * 按照货位上架 0:关闭 1:启用
+     */
+    @TableField(value = "queueStatus")
+    private Integer queueStatus;
+
+
 
     @TableField(exist = false)
     private String invName;

src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java

@@ -143,6 +143,8 @@ public class SysWorkplaceResponse {
     @TableField(value = "workPlaceClass")
     private Integer workPlaceClass;
 
+    private String  queueStatus;
+
 
     @TableField(exist = false)
     private String invName;

src/main/resources/schemas/schema_v2.4.sql

@@ -4599,3 +4599,7 @@ CALL Pro_Temp_ColumnWork('io_split_fifo_code', 'workPlaceQueueCode',
                          'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''上货货位编码''',
                          1);
 
+
+CALL Pro_Temp_ColumnWork('sys_workplace', 'queueStatus',
+                         ' tinyint NULL DEFAULT b''0''COMMENT ''是否按照货位上架0:关闭 1:启用''',
+                         1);