订单状态值修改

develop-QA
sunjianxi 4 months ago committed by liuqingkun
parent 3855664a7c
commit fc8908816b
  1. 4
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java
  2. 11
      blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java
  3. 30
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java
  4. 119
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipmentEntity.java
  5. 3
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.java
  6. 2
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.xml
  7. 4
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml
  8. 3
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipmentService.java
  9. 2
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipmentServiceImpl.java
  10. 2
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipmentVO.java
  11. 2
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipmentWrapper.java
  12. 2
      blade-service/blade-scheduling/src/main/resources/application-dev.yml

@ -37,8 +37,8 @@ import java.math.BigDecimal;
/**
* 设备信息表 实体类
*
* @author qyl
* @since 2025-12-26
* @author BladeX
* @since 2025-12-22
*/
@Data
@TableName("MES_EQUIPMENT")

@ -19,6 +19,7 @@ import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.desk.order.pojo.entity.YieldOrder;
import org.springblade.desk.order.pojo.entity.YieldOrderCraft;
import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
import org.springblade.desk.order.pojo.vo.YieldOrderVo;
import org.springblade.desk.order.service.IYieldOrderCraftService;
import org.springblade.desk.order.service.IYieldOrderService;
@ -124,6 +125,16 @@ public class YieldOrderController extends BladeController {
return R.status(result);
}
/**
* 批量关闭
*/
@PostMapping("/closeBatch")
@Operation(summary = "批量关闭", description = "传入ids")
public R closeBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
Boolean result = yieldOrderService.changeStatus(Func.toLongList(ids), YieldOrderEnum.STATUS_CLOSED.getCategory());
return R.status(result);
}
/**
* 工艺路线
*/

@ -25,35 +25,33 @@
*/
package org.springblade.scheduling.scheduling.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.scheduling.scheduling.entity.CraftAbilityEntity;
import org.springblade.scheduling.scheduling.entity.EquipmentEntity;
import org.springblade.desk.device.pojo.entity.EquipmentEntity;
import org.springblade.scheduling.scheduling.excel.EquipmentExcel;
import org.springblade.scheduling.scheduling.service.IEquipmentService;
import org.springblade.scheduling.scheduling.vo.EquipmentVO;
import org.springblade.scheduling.scheduling.wrapper.EquipmentWrapper;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* 设备信息表 控制器

@ -1,119 +0,0 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.entity;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;
import java.io.Serial;
/**
* 设备信息表 实体类
*
* @author BladeX
* @since 2025-12-22
*/
@Data
@TableName("MES_EQUIPMENT")
@Schema(description = "MesEquipment对象")
@EqualsAndHashCode(callSuper = true)
public class EquipmentEntity extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 设备编码
*/
@Schema(description = "设备编码")
private String deviceCode;
/**
* 设备名称
*/
@Schema(description = "设备名称")
private String deviceName;
/**
* 类别名称
*/
@Schema(description = "类别名称")
private String typeName;
/**
* 规格型号
*/
@Schema(description = "规格型号")
private String macSpec;
/**
* 服役状态;1正常服役2暂停服役
*/
@Schema(description = "服役状态;1、正常服役,2、暂停服役")
private BigDecimal used;
/**
* RFID
*/
@Schema(description = "RFID")
private String rfId;
/**
* 虚拟设备;1., 0.
*/
@Schema(description = "虚拟设备;1.是, 0.否")
private String virtualMac;
/**
* 是否对接;1., 0.
*/
@Schema(description = "是否对接;1.是, 0.否")
private String docking;
/**
* 类别说明
*/
@Schema(description = "类别说明")
private String memo;
/**
* 绑定数量
*/
@Schema(description = "绑定数量")
private BigDecimal bindQty;
/**
* 设备分类
*/
@Schema(description = "设备分类")
private String category;
/**
* 设备ip
*/
@Schema(description = "设备ip")
private String deviceIp;
/**
* 设备分类
*/
@Schema(description = "设备分类")
private String categorys;
}

@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.scheduling.scheduling.entity.EquipmentEntity;
import org.springblade.desk.device.pojo.entity.EquipmentEntity;
import org.springblade.scheduling.scheduling.excel.EquipmentExcel;
import org.springblade.scheduling.scheduling.vo.EquipmentVO;
@ -47,7 +47,6 @@ public interface EquipmentMapper extends BaseMapper<EquipmentEntity> {
* 自定义分页
*
* @param page 分页参数
* @param Equipment 查询参数
* @return List<EquipmentVO>
*/
List<EquipmentVO> selectEquipmentPage(IPage page, EquipmentVO equipment);

@ -3,7 +3,7 @@
<mapper namespace="org.springblade.scheduling.scheduling.mapper.EquipmentMapper">
<!-- 通用查询映射结果 -->
<resultMap id="equipmentResultMap" type="org.springblade.scheduling.scheduling.entity.EquipmentEntity">
<resultMap id="equipmentResultMap" type="org.springblade.desk.device.pojo.entity.EquipmentEntity">
<result column="ID" property="id"/>
<result column="DEVICE_CODE" property="deviceCode"/>
<result column="DEVICE_NAME" property="deviceName"/>

@ -169,9 +169,9 @@
b.WC_NAME AS "workCenterName",
a.WORK_CENTER_ID AS "workCenterId",
-- 统计待排产的数量
COUNT(CASE WHEN a.STATUS >= 3 THEN a.WORK_CENTER_ID END) AS "totalCount",
COUNT(CASE WHEN a.STATUS >= 10003 THEN a.WORK_CENTER_ID END) AS "totalCount",
-- 统计已排产的数量
COUNT(CASE WHEN a.STATUS not in (3,6) THEN a.WORK_CENTER_ID END) AS "schedulingCount"
COUNT(CASE WHEN a.STATUS not in (10003,10006) THEN a.WORK_CENTER_ID END) AS "schedulingCount"
FROM MES_YIELD_ORDER a
LEFT JOIN BS_WORK_CENTER b ON a.WORK_CENTER_ID = b.ID
<where>

@ -28,7 +28,7 @@ package org.springblade.scheduling.scheduling.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.scheduling.scheduling.entity.EquipmentEntity;
import org.springblade.desk.device.pojo.entity.EquipmentEntity;
import org.springblade.scheduling.scheduling.excel.EquipmentExcel;
import org.springblade.scheduling.scheduling.vo.EquipmentVO;
@ -45,7 +45,6 @@ public interface IEquipmentService extends BaseService<EquipmentEntity> {
* 自定义分页
*
* @param page 分页参数
* @param Equipment 查询参数
* @return IPage<EquipmentVO>
*/
IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment);

@ -25,7 +25,7 @@
*/
package org.springblade.scheduling.scheduling.service.impl;
import org.springblade.scheduling.scheduling.entity.EquipmentEntity;
import org.springblade.desk.device.pojo.entity.EquipmentEntity;
import org.springblade.scheduling.scheduling.excel.EquipmentExcel;
import org.springblade.scheduling.scheduling.mapper.EquipmentMapper;
import org.springblade.scheduling.scheduling.service.IEquipmentService;

@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.scheduling.scheduling.entity.EquipmentEntity;
import org.springblade.desk.device.pojo.entity.EquipmentEntity;
import java.io.Serial;

@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.scheduling.scheduling.entity.EquipmentEntity;
import org.springblade.desk.device.pojo.entity.EquipmentEntity;
import org.springblade.scheduling.scheduling.vo.EquipmentVO;
import java.util.Objects;

@ -13,4 +13,4 @@ business:
oldMes:
url: 192.168.169.172:9000
# url: 127.0.0.1:32111
pushApsResult: /zhgd-rb/aiWebapi/pushApsResult
pushApsResult: /zhgd-rb/aiWebapi/receiveApsResult

Loading…
Cancel
Save