opt: 工单

This commit is contained in:
2025-10-16 10:50:41 +08:00
parent 7b6fe148f0
commit 7ab5179806
5 changed files with 325 additions and 145 deletions

View File

@@ -133,9 +133,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
public List<String> getPermissionList(JSONObject userDto) {
List<String> permission = new LinkedList<>();
// 查看是否为管理员
if (userDto.getBoolean("is_admin")) {
permission.add("admin");
}
// if (userDto.getBoolean("is_admin")) {
// permission.add("admin");
// }
permission.addAll(sysMenuMapper.getPermissionByUserId(userDto.getString("user_id")));
return permission;
}

View File

@@ -1,125 +1,133 @@
package org.nl.wms.pdm.order.service.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @description /
* @author lyd
* @date 2025-07-14
**/
* @author lyd
* @description /
* @date 2023-05-05
**/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("pdm_bd_workorder")
public class PdmBdWorkorder implements Serializable {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
@TableId(value = "workorder_id", type = IdType.NONE)
/** 工单标识 */
private String workorder_id;
/** 工单编号 */
private String workorder_code;
/** 生产日期 */
private String produce_date;
/** 计划数量 */
private BigDecimal plan_qty;
/** 实际数量 */
private BigDecimal real_qty;
/** 物料标识 */
private BigDecimal plan_weight;
private BigDecimal real_weight;
private String material_id;
/** 载具类型 */
private String vehicle_type;
private String raw_material_code;
/** 计划开始时间 */
private String planproducestart_date;
private String produce_order;
/** 计划结束时间 */
private String planproduceend_date;
/** 实际开始时间 */
private String realproducestart_date;
/** 实际结束时间 */
private String realproduceend_date;
/** 区域编码 */
private String region_code;
/** 区域名称 */
private String region_name;
/** 是否需要AGV搬运 */
private String is_needmove;
/** 工单类型 */
private String workorder_type;
/** 回传MES状态 */
private String passback_status;
/** 车间编码 */
private String workshop_code;
/** 外部标识 */
private String ext_id;
/** 是否删除 */
private Boolean is_delete;
/** 创建人 */
private String create_id;
/** 创建人 */
private String create_name;
/** 创建时间 */
private String create_time;
/** 修改人 */
private String update_id;
/** 修改人 */
private String update_name;
/** 修改时间 */
private String update_time;
/** 设备标识 */
private String device_id;
/** 设备名称 */
private String device_code;
/** 所属工序 */
private String workorder_procedure;
/** 工单状态 */
private String order_status;
/** 外部数据 */
private String ext_data;
/** 开工人 */
private String operator;
/** 生产批次号 */
private String batch_no;
/** 班组 */
private String team;
private String produce_date;
private String vehicle_type;
private String planproducestart_date;
private String planproduceend_date;
private String realproducestart_date;
private String realproduceend_date;
private Integer standing_time;
private String point_code;
private String point_name;
private String region_code;
private String region_name;
private String workorder_status;
private Boolean is_needmove;
private String workorder_type;
@TableField(exist = false)
private String production_order;
private String passback_status;
private String workshop_code;
private String ext_id;
private String ext_data;
private Boolean is_delete;
private String create_id;
private String create_name;
private String create_time;
private String update_id;
private String update_name;
private String update_time;
private Boolean is_urgent;
private String operator;
private Integer qualified_qty;
private Integer unqualified_qty;
private Integer priority;
@TableField(exist = false)
private String material_name;
@TableField(exist = false)
private String material_code;
@TableField(exist = false)
private String material_spec;
@TableField(exist = false)
private String half_material_code;
@TableField(exist = false)
private String order_no;
@TableField(exist = false)
private String custer_no;
@TableField(exist = false)
private int order_subnum;
@TableField(exist = false)
private int guadansum;
@TableField(exist = false)
private String pack_method;
@TableField(exist = false)
private String row_num;
}