Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java

@@ -32,17 +32,17 @@ public class OrderPageReqVOCopy extends PageParam {
     @Schema(description = "状态列表")
     private List<Integer> stateList;
     @Schema(description = "矩形")
-    private boolean rectangle;
+    private Boolean rectangle;
     @Schema(description = "异形")
-    private boolean specialShaped;
+    private Boolean specialShaped;
     @Schema(description = "造型")
-    private boolean sculpt;
+    private Boolean sculpt;
     @Schema(description = "有挖穿造型")
-    private boolean holeThrough;
+    private Boolean holeThrough;
     @Schema(description = "有挖穿孔")
-    private boolean burrow;
+    private Boolean burrow;
     @Schema(description = "有二维纹路")
-    private boolean twoDimensionalToolPath;
+    private Boolean twoDimensionalToolPath;
     @Schema(description = "开始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private Date beginDate;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java

@@ -249,13 +249,13 @@ public class PlanServiceImpl implements PlanService {
                 .isNull("d.order_id")
         ;
         List<Integer> filterTypes = new ArrayList<>();
-        if (pageReqVO.isHoleThrough()) {
+        if (Objects.nonNull(pageReqVO.getHoleThrough()) && pageReqVO.getHoleThrough()) {
             filterTypes.add(1);
         }
-        if (pageReqVO.isBurrow()) {
+        if (Objects.nonNull(pageReqVO.getBurrow()) && pageReqVO.getBurrow()) {
             filterTypes.add(2);
         }
-        if (pageReqVO.isTwoDimensionalToolPath()) {
+        if (Objects.nonNull(pageReqVO.getTwoDimensionalToolPath()) && pageReqVO.getTwoDimensionalToolPath()) {
             filterTypes.add(4);
         }
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml

@@ -7,8 +7,9 @@
         count(c.id) as num, sum(c.area) as area, p.goods_name, p.color, p.material, p.goods_id
         from `order` a
         left join order_plate c ON a.id = c.order_id and c.is_cancel = 0
-        left join plate p on c.goods_id = p.goods_id
+        left join order_goods p on c.goods_id = p.goods_id
         left join order_item d ON c.order_id = d.order_id
+        left join order_plan_item e on d.id = e.item_id
         ${ew.customSqlSegment}
         group by orderId, p.id
     </select>

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java

@@ -1,20 +1,26 @@
 package com.cf.imes.module.system.controller.admin.machine;
 
+import com.cf.imes.framework.common.enums.CommonStatusEnum;
 import com.cf.imes.framework.es.core.valid.CreateGroup;
 import com.cf.imes.framework.es.core.valid.UpdateGroup;
 import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
+import com.cf.imes.framework.organ.core.context.OrganContextHolder;
 import com.cf.imes.module.system.controller.admin.machine.vo.*;
+import com.cf.imes.module.system.dal.dataobject.dept.DeptDO;
 import com.cf.imes.module.system.dal.dataobject.machine.MachineDO;
 import com.cf.imes.module.system.service.machine.MachineService;
 import com.cf.imes.module.system.service.machine.MachineTemplateService;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
+
 import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
+
 import javax.validation.*;
+
 import com.cf.imes.framework.common.pojo.PageResult;
 import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.common.util.object.BeanUtils;
@@ -125,5 +131,12 @@ public class MachineController {
         return success(machineService.getMachineTree(organId));
     }
 
+    @GetMapping(value = {"/list-all-simple", "/simple-list"})
+    @Operation(summary = "获取机台精简信息列表", description = "主要用于前端的下拉选项")
+    public CommonResult<List<MachineSimpleRespVO>> getSimpleDeptList(@RequestParam(required = false) Long organId) {
+        organId = organId == null ? OrganContextHolder.getOrganId() : organId;
+        List<MachineSimpleRespVO> list = machineService.simpleList(organId);
+        return success(list);
+    }
 
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineSimpleRespVO.java

@@ -0,0 +1,16 @@
+package com.cf.imes.module.system.controller.admin.machine.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author Beal
+ */
+@Data
+public class MachineSimpleRespVO {
+    @Schema(description = "机台id")
+    private Long id;
+
+    @Schema(description = "机台名称")
+    private String name;
+}

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineService.java

@@ -80,4 +80,6 @@ public interface MachineService {
     OrganMachineResp organMachineByOrganId(Long organId);
 
     PageResult<MachineDO> page(MachinePageReqVO pageParam);
+
+    List<MachineSimpleRespVO> simpleList(Long organId);
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cf.imes.framework.es.core.dal.ESDocument;
 import com.cf.imes.framework.es.core.service.ESDocumentService;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.cf.imes.framework.organ.core.aop.OrganIgnore;
 import com.cf.imes.framework.security.core.LoginUser;
 import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
 import com.cf.imes.module.system.controller.admin.machine.vo.*;
@@ -290,6 +291,16 @@ public class MachineServiceImpl implements MachineService {
         return machineMapper.selectPage(pageParam, new ArrayList<>());
     }
 
+    @Override
+    @OrganIgnore
+    public List<MachineSimpleRespVO> simpleList(Long organId) {
+        List<MachineDO> machineDOS = machineMapper.selectList(new LambdaQueryWrapperX<MachineDO>()
+                .select(MachineDO::getId, MachineDO::getName)
+                .eq(MachineDO::getOrganId, organId)
+        );
+        return BeanUtils.toBean(machineDOS, MachineSimpleRespVO.class);
+    }
+
     private void validateExists(Long id) {
         if (machineMapper.selectById(id) == null) {
             throw exception(MACHINE_NOT_EXISTS);