Merge pull request 'newMethod' (#1) from newMethod into main

Reviewed-on: http://112.4.208.194:3000/FeiDaBaoKai/wms_server_kate_suzhou/pulls/1

src/main/java/com/wms/controller/StandController.java

@@ -8,7 +8,6 @@ import com.wms.annotation.MyLog;
 import com.wms.constants.enums.ResponseCode;
 import com.wms.entity.app.ResponseEntity;
 import com.wms.entity.app.dto.PageDto;
-import com.wms.entity.app.dto.StandDto;
 import com.wms.entity.app.request.StandQuery;
 import com.wms.entity.app.vo.StandVo;
 import com.wms.entity.app.wcs.DdjStatusChangeRequest;
@@ -66,7 +65,9 @@ public class StandController {
                     .like(StringUtils.isNotEmpty(standQuery.getStandId()), Stand::getStandId, standQuery.getStandId())
                     .eq(standQuery.getStandStatus() != null, Stand::getStandStatus, standQuery.getStandStatus())
                     .eq(standQuery.getIsLock() != null, Stand::getIsLock, standQuery.getIsLock())
-                    .eq(standQuery.getStandType() != null, Stand::getStandType, standQuery.getStandType());
+                    .eq(standQuery.getStandType() != null, Stand::getStandType, standQuery.getStandType())
+                    .eq(standQuery.getAllowMwl() != null, Stand::getAllowMwl, standQuery.getAllowMwl())
+                    .eq(standQuery.getAllowMg() != null, Stand::getAllowMg, standQuery.getAllowMg());
             Page<Stand> standPage = standService.page(page, lambdaQueryWrapper);
 
             PageDto<StandVo> pageDto = PageDto.of(standPage, stand -> BeanUtil.copyProperties(stand, StandVo.class));
@@ -112,6 +113,8 @@ public class StandController {
                     .set(request.getLastUseTime() != null, Stand::getLastUseTime, request.getLastUseTime())
                     .set(request.getPickVehicleCount() != null, Stand::getPickVehicleCount, request.getPickVehicleCount())
                     .set(request.getAllowNoPlan() != null, Stand::getAllowNoPlan, request.getAllowNoPlan())
+                    .set(request.getAllowMwl() != null, Stand::getAllowMwl, request.getAllowMwl())
+                    .set(request.getAllowMg() != null, Stand::getAllowMg, request.getAllowMg())
                     .eq(Stand::getStandId, request.getStandId());
             if (standService.update(lambdaUpdateWrapper)) {
                 logger.info("更新站台信息成功。");

src/main/java/com/wms/entity/app/request/StandQuery.java

@@ -99,4 +99,14 @@ public class StandQuery extends PageQuery {
      */
     @JsonProperty("allowNoPlan")
     private Integer allowNoPlan;
+    /**
+     * 允许做装载机
+     */
+    @JsonProperty("allowMwl")
+    private Integer allowMwl;
+    /**
+     * 允许做平地机
+     */
+    @JsonProperty("allowMg")
+    private Integer allowMg;
 }

src/main/java/com/wms/entity/app/vo/StandVo.java

@@ -97,4 +97,14 @@ public class StandVo {
      */
     @JsonProperty("allowNoPlan")
     private Integer allowNoPlan;
+    /**
+     * 允许做装载机
+     */
+    @JsonProperty("allowMwl")
+    private Integer allowMwl;
+    /**
+     * 允许做平地机
+     */
+    @JsonProperty("allowMg")
+    private Integer allowMg;
 }

src/main/java/com/wms/entity/table/Stand.java

@@ -96,4 +96,14 @@ public class Stand {
      */
     @TableField("allow_no_plan")
     private Integer allowNoPlan;
+    /**
+     * 允许做装载机
+     */
+    @TableField("allow_mwl")
+    private Integer allowMwl;
+    /**
+     * 允许做平地机
+     */
+    @TableField("allow_mg")
+    private Integer allowMg;
 }

src/main/java/com/wms/service/business/IWorkService.java

@@ -28,4 +28,6 @@ public interface IWorkService {
      * 分配工作
      */
     void distributeWorks();
+
+    void distributeWorksMethod2();
 }