diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/PdmBiSlittingproductionplan.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/PdmBiSlittingproductionplan.java index f22007cee..dfcee287e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/PdmBiSlittingproductionplan.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/PdmBiSlittingproductionplan.java @@ -153,4 +153,6 @@ public class PdmBiSlittingproductionplan implements Serializable { /** 气涨轴规格 */ private String qzz_size; + /** 子卷等级*/ + private String level; } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/controller/PdmBiSlittingproductionplanController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/controller/PdmBiSlittingproductionplanController.java deleted file mode 100644 index 8877dcc42..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/controller/PdmBiSlittingproductionplanController.java +++ /dev/null @@ -1,96 +0,0 @@ -package org.nl.b_lms.pdm.productionplan.controller; - -import java.util.Set; -import java.util.Map; - -import org.nl.b_lms.pdm.productionplan.dao.PdmBiSlittingproductionplan; -import org.nl.common.TableDataInfo; -import org.springframework.web.bind.annotation.*; -import lombok.RequiredArgsConstructor; - -import javax.annotation.Resource; - -import lombok.extern.slf4j.Slf4j; -import org.nl.common.domain.query.PageQuery; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.nl.modules.logging.annotation.Log; -import org.nl.b_lms.pdm.productionplan.service.IpdmBiSlittingproductionplanService; - - -/** - * {@code @Description:} 分切生产计划(PdmBiSlittingproductionplan)控制层 - * {@code @Author:} gbx - * - * @since 2024-01-27 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping("/api/pdmBiSlittingproductionplan") -@Slf4j -public class PdmBiSlittingproductionplanController { - - - @Resource - private IpdmBiSlittingproductionplanService pdmBiSlittingproductionplanService; - - - /** - * 分页查询 - * - * @param whereJson 查询条件 - * @param page 分页参数 - */ - @GetMapping - @Log("查询分切生产计划") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { - return new ResponseEntity<>(TableDataInfo.build(pdmBiSlittingproductionplanService.queryAll(whereJson, page)), HttpStatus.OK); - } - - - /** - * 新增数据 - * - * @param entity 实体对象 - * @return 新增结果 - */ - @PostMapping - @Log("新增分切生产计划") - public ResponseEntity create(PdmBiSlittingproductionplan entity) { - pdmBiSlittingproductionplanService.create(entity); - return new ResponseEntity<>(HttpStatus.OK); - } - - - /** - * 修改数据 - * - * @param entity 实体对象 - * @return 修改结果 - */ - @PutMapping - @Log("修改分切生产计划") - //@SaCheckPermission("@el.check(PdmBiSlittingproductionplan:edit')") - public ResponseEntity update(PdmBiSlittingproductionplan entity) { - pdmBiSlittingproductionplanService.update(entity); - return new ResponseEntity<>(HttpStatus.OK); - } - - - /** - * 删除数据 - * - * @param ids 多个主键Id - * @return 删除结果 - */ - @Log("删除分切生产计划") - //@SaCheckPermission("@el.check(PdmBiSlittingproductionplan:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Set ids) { - pdmBiSlittingproductionplanService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - -} - diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/dao/PdmBiSlittingproductionplan.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/dao/PdmBiSlittingproductionplan.java deleted file mode 100644 index 26f421d8d..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/dao/PdmBiSlittingproductionplan.java +++ /dev/null @@ -1,312 +0,0 @@ -package org.nl.b_lms.pdm.productionplan.dao; - -import java.math.BigDecimal; -import java.io.Serializable; -import java.math.BigDecimal; - -import lombok.*; -import lombok.Data; -import lombok.Builder; -import lombok.EqualsAndHashCode; -import lombok.AllArgsConstructor; -import com.baomidou.mybatisplus.annotation.*; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; - - -/** - * {@code @Description:} 分切生产计划(PdmBiSlittingproductionplan)实体类 - * {@code @Author:} gbx - * - * @since 2024-01-27 - */ -@Data -@Builder -@ToString -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@SuppressWarnings("serial") -@TableName("pdm_bi_slittingproductionplan") -public class PdmBiSlittingproductionplan extends Model { - - private static final long serialVersionUID = -7739291296662381393L; - - - - - /** - * 分切计划标识 - */ - @TableId(value = "workorder_id", type = IdType.NONE) - private Long workorder_id; - - - /** - * 分切订单类型 - */ - private String order_type; - - - /** - * 子卷号 - */ - private String container_name; - - - /** - * 产品编码 - */ - private String product_name; - - - /** - * 产品描述 - */ - private String description; - - - /** - * 来源母卷号 - */ - private String parent_container_name; - - - /** - * 改制来源子卷号 - */ - private String restruct_container_name; - - - /** - * 子卷立库木箱号 - */ - private String package_box_sn; - - - /** - * 来源卷位置 - */ - private String ware_house; - - - /** - * 分切机台编码 - */ - private String resource_name; - - - /** - * 分切组 - */ - private String split_group; - - - /** - * 生产顺序 - */ - private String manufacture_sort; - - - /** - * 生产订单 - */ - private String mfg_order_name; - - - /** - * 生产日期 - */ - private String manufacture_date; - - - /** - * 管件类型 - */ - private String paper_tube_or_FRP; - - - /** - * 纸筒物料编码 - */ - private String paper_tube_material; - - - /** - * 纸筒物料描述 - */ - private String paper_tube_description; - - - /** - * 纸筒规格 - */ - private String paper_tube_model; - - - - /** - * 纸管定级(待检区：1,2,3；管制区：4,6) - */ - @TableField(exist = false) - private String level; - - /** - * FRP管物料编码 - */ - private String FRP_material; - - - /** - * FRP管物料描述 - */ - private String FRP_description; - - - /** - * FRP管规格 - */ - private String FRP_model; - - - /** - * 子卷幅宽 - */ - private BigDecimal split_breadth; - - - /** - * 子卷理论长度 - */ - private BigDecimal split_height; - - - /** - * 子卷理论重量 - */ - private BigDecimal split_weight; - - - /** - * 开始时间 - */ - private String start_time; - - - /** - * 结束时间 - */ - private String end_time; - - - /** - * 状态 - */ - private String status; - - - /** - * 上料完成 - */ - private String is_parent_ok; - - - /** - * 子卷套轴完成 - */ - private String is_child_tz_ok; - - - /** - * 子卷配送完成 - */ - private String is_child_ps_ok; - - - /** - * 气涨轴编码 - */ - private String qzzno; - - - /** - * 修改人 - */ - private Long update_optid; - - - /** - * 修改人姓名 - */ - private String update_optname; - - - /** - * 修改时间 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private String update_time; - - - /** - * 部门ID - */ - private Long sysdeptid; - - - /** - * 公司ID - */ - private Long syscompanyid; - - - /** - * 是否删除 - */ - @TableField(fill = FieldFill.INSERT) - private String is_delete; - - - /** - * 销售订单及行号 - */ - private String sale_order_name; - - - /** - * 是否呼叫 - */ - private String is_call; - - - /** - * 呼叫时间 - */ - private String call_time; - - - /** - * 是否呼叫纸管 - */ - private String is_paper_ok; - - /** 上下轴（1，2） */ - private String up_or_down; - - /** 左右（1，2） */ - private String left_or_right; - - - /** - * 获取主键值 - * - * @return 主键值 - */ - @Override - protected Serializable pkVal() { - return this.workorder_id; - } - -} - - - diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/dao/mapper/PdmBiSlittingproductionplanMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/dao/mapper/PdmBiSlittingproductionplanMapper.java deleted file mode 100644 index 19d5f2e47..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/dao/mapper/PdmBiSlittingproductionplanMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.nl.b_lms.pdm.productionplan.dao.mapper; - -import org.nl.b_lms.pdm.productionplan.dao.PdmBiSlittingproductionplan; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * {@code @Description:} 分切生产计划(PdmBiSlittingproductionplan)数据持久层 - * {@code @Author:} gbx - * - * @since 2024-01-27 - */ -public interface PdmBiSlittingproductionplanMapper extends BaseMapper { - - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/dao/xml/PdmBiSlittingproductionplanMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/dao/xml/PdmBiSlittingproductionplanMapper.xml deleted file mode 100644 index e88f31caf..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/dao/xml/PdmBiSlittingproductionplanMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/dto/PdmBiSlittingproductionplanDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/dto/PdmBiSlittingproductionplanDto.java deleted file mode 100644 index 638be3ec6..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/dto/PdmBiSlittingproductionplanDto.java +++ /dev/null @@ -1,190 +0,0 @@ -package org.nl.b_lms.pdm.productionplan.dto; - -import java.math.BigDecimal; -import java.io.Serializable; - -import lombok.*; -import lombok.Data; -import lombok.Builder; - - -/** - * {@code @Description:} 分切生产计划(PdmBiSlittingproductionplan)数据传输类 - * {@code @Author:} gbx - * - * @since 2024-01-27 - */ -@Data -@Builder -@ToString -public class PdmBiSlittingproductionplanDto implements Serializable { - - /** - * 分切计划标识 - */ - private Long workorder_id; - /** - * 分切订单类型 - */ - private String order_type; - /** - * 子卷号 - */ - private String container_name; - /** - * 产品编码 - */ - private String product_name; - /** - * 产品描述 - */ - private String description; - /** - * 来源母卷号 - */ - private String parent_container_name; - /** - * 改制来源子卷号 - */ - private String restruct_container_name; - /** - * 子卷立库木箱号 - */ - private String package_box_sn; - /** - * 来源卷位置 - */ - private String ware_house; - /** - * 分切机台编码 - */ - private String resource_name; - /** - * 分切组 - */ - private String split_group; - /** - * 生产顺序 - */ - private String manufacture_sort; - /** - * 生产订单 - */ - private String mfg_order_name; - /** - * 生产日期 - */ - private String manufacture_date; - /** - * 管件类型 - */ - private String paper_tube_or_FRP; - /** - * 纸筒物料编码 - */ - private String paper_tube_material; - /** - * 纸筒物料描述 - */ - private String paper_tube_description; - /** - * 纸筒规格 - */ - private String paper_tube_model; - /** - * FRP管物料编码 - */ - private String FRP_material; - /** - * FRP管物料描述 - */ - private String FRP_description; - /** - * FRP管规格 - */ - private String FRP_model; - /** - * 子卷幅宽 - */ - private BigDecimal split_breadth; - /** - * 子卷理论长度 - */ - private BigDecimal split_height; - /** - * 子卷理论重量 - */ - private BigDecimal split_weight; - /** - * 开始时间 - */ - private String start_time; - /** - * 结束时间 - */ - private String end_time; - /** - * 状态 - */ - private String status; - /** - * 上料完成 - */ - private String is_parent_ok; - /** - * 子卷套轴完成 - */ - private String is_child_tz_ok; - /** - * 子卷配送完成 - */ - private String is_child_ps_ok; - /** - * 气涨轴编码 - */ - private String qzzno; - /** - * 修改人 - */ - private Long update_optid; - /** - * 修改人姓名 - */ - private String update_optname; - /** - * 修改时间 - */ - private String update_time; - /** - * 部门ID - */ - private Long sysdeptid; - /** - * 公司ID - */ - private Long syscompanyid; - /** - * 是否删除 - */ - private String is_delete; - /** - * 销售订单及行号 - */ - private String sale_order_name; - /** - * 是否呼叫 - */ - private String is_call; - /** - * 呼叫时间 - */ - private String call_time; - /** - * 是否呼叫纸管 - */ - private String is_paper_ok; - -} - - - diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/dto/PdmBiSlittingproductionplanQuery.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/dto/PdmBiSlittingproductionplanQuery.java deleted file mode 100644 index 4623d06ae..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/dto/PdmBiSlittingproductionplanQuery.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.nl.b_lms.pdm.productionplan.dto; - - -import java.math.BigDecimal; - - -import lombok.Data; -import lombok.Builder; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import org.nl.b_lms.pdm.productionplan.dao.PdmBiSlittingproductionplan; -import org.nl.common.domain.query.BaseQuery; - -/** - * @Author: gbx - * @since 2024-01-27 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class PdmBiSlittingproductionplanQuery extends BaseQuery { - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/service/IpdmBiSlittingproductionplanService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/service/IpdmBiSlittingproductionplanService.java deleted file mode 100644 index e6366cc64..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/service/IpdmBiSlittingproductionplanService.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.nl.b_lms.pdm.productionplan.service; - -import org.nl.b_lms.pdm.productionplan.dao.PdmBiSlittingproductionplan; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.Map; -import java.util.Set; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; - - -/** - * {@code @Description:} 分切生产计划(PdmBiSlittingproductionplan)服务接口层 - * {@code @Author:} gbx - * - * @since 2024-01-27 - */ -public interface IpdmBiSlittingproductionplanService extends IService { - - - /** - * 查询数据分页 - * - * @param whereJson 查询条件 - * @param pageable 分页参数 - * @return IPage - */ - IPage queryAll(Map whereJson, PageQuery pageable); - - - /** - * 创建 - * - * @param entity / - */ - void create(PdmBiSlittingproductionplan entity); - - - /** - * 编辑 - * - * @param entity / - */ - void update(PdmBiSlittingproductionplan entity); - - /** - * 多选删除 - * - * @param ids / - */ - void deleteAll(Set ids); - - -} - - diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java deleted file mode 100644 index 92ee36e29..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java +++ /dev/null @@ -1,106 +0,0 @@ -package org.nl.b_lms.pdm.productionplan.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.nl.b_lms.pdm.productionplan.dao.PdmBiSlittingproductionplan; -import org.nl.b_lms.pdm.productionplan.dao.mapper.PdmBiSlittingproductionplanMapper; -import org.nl.b_lms.pdm.productionplan.service.IpdmBiSlittingproductionplanService; -import cn.hutool.core.date.DateUtil; -import org.nl.common.utils.SecurityUtils; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; - -import javax.annotation.Resource; -import java.util.Map; -import java.util.Set; - - -/** - * {@code @Description:} 分切生产计划(PdmBiSlittingproductionplan)服务实现层 - * {@code @Author:} gbx - * - * @since 2024-01-27 - */ -@Service("pdmBiSlittingproductionplanService") -public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl implements IpdmBiSlittingproductionplanService { - - - @Resource - private PdmBiSlittingproductionplanMapper pdmBiSlittingproductionplanMapper; - - - /** - * 查询数据分页 - * - * @param whereJson 查询条件 - * @param page 分页参数 - */ - @Override - public IPage queryAll(Map whereJson, PageQuery page) { - return pdmBiSlittingproductionplanMapper.selectPage(new Page<>(page.getPage() + 1, page.getSize()), new QueryWrapper() - .lambda() - ); - } - - - /** - * 创建 - * - * @param entity 对象实体 - */ - @Override - public void create(PdmBiSlittingproductionplan entity) { - pdmBiSlittingproductionplanMapper.insert(getBasicInfo(entity, true)); - } - - - /** - * 编辑 - * - * @param entity 对象实体 - */ - @Override - public void update(PdmBiSlittingproductionplan entity) { - // PdmBiSlittingproductionplan dto = pdmBiSlittingproductionplanMapper.selectById(entity.getId); - // if (dto == null) { - // throw new BadRequestException("不存在该数据！"); - // } - pdmBiSlittingproductionplanMapper.updateById(getBasicInfo(entity, false)); - } - - - /** - * 多选删除 - * - * @param ids 多个Id主键 - */ - @Override - public void deleteAll(Set ids) { - // 物理删除 - pdmBiSlittingproductionplanMapper.deleteBatchIds(ids); - } - - - /** - * 获取实体基础信息 - * - * @param entity 对象实体 - * @param isCreate 是否创建 - */ - private PdmBiSlittingproductionplan getBasicInfo(PdmBiSlittingproductionplan entity, boolean isCreate) { - // if (isCreate) { - // entity.setCreate_id(Long.valueOf(SecurityUtils.getCurrentUserId())); - // entity.setCreate_name(SecurityUtils.getCurrentNickName()); - // entity.setCreate_time(DateUtil.now()); - // } - // entity.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); - // entity.setUpdate_optname(SecurityUtils.getCurrentNickName()); - // entity.setUpdate_time(DateUtil.now()); - return entity; - } - - -} - diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/BstIvtPackageinfoivt.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/BstIvtPackageinfoivt.java index be6a16e0d..342f599d0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/BstIvtPackageinfoivt.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/BstIvtPackageinfoivt.java @@ -2,14 +2,9 @@ package org.nl.b_lms.sch.point.dao; import java.math.BigDecimal; import java.io.Serializable; -import java.math.BigDecimal; -import lombok.*; import lombok.Data; -import lombok.Builder; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; -import lombok.AllArgsConstructor; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -19,26 +14,20 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; * {@code @Description:} 装箱区点位库存表(BstIvtPackageinfoivt)实体类 * {@code @Author:} gbx * - * @since 2024-01-24 + * @since 2024-02-27 */ @Data -@Builder -@ToString - -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@SuppressWarnings("serial") +@EqualsAndHashCode(callSuper = true) @TableName("bst_ivt_packageinfoivt") public class BstIvtPackageinfoivt extends Model { private static final long serialVersionUID = -7739291296662381393L; - + //@TableId(value = "id", type = IdType.NONE) /** * 库存记录标识 */ - @TableId(value = "ivt_id", type = IdType.NONE) private Long ivt_id; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/SchBasePoint.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/SchBasePoint.java index 802e3dbd9..a03dc5907 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/SchBasePoint.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/SchBasePoint.java @@ -1,307 +1,288 @@ package org.nl.b_lms.sch.point.dao; + import java.math.BigDecimal; import java.io.Serializable; -import java.math.BigDecimal; -import lombok.*; + import lombok.Data; -import lombok.Builder; import lombok.EqualsAndHashCode; -import lombok.AllArgsConstructor; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; - - /** +/** * {@code @Description:} 点位基础表(SchBasePoint)实体类 * {@code @Author:} gbx - * @since 2024-01-25 + * + * @since 2024-02-28 */ @Data -@Builder -@ToString -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@SuppressWarnings("serial") +@EqualsAndHashCode(callSuper = true) @TableName("sch_base_point") -public class SchBasePoint extends Model -{ +public class SchBasePoint extends Model { - private static final long serialVersionUID = -7739291296662381393L; - //@TableId(value = "id", type = IdType.NONE) - - - - - /** - * 点位标识 - */ - @TableId(value = "point_id", type = IdType.NONE) - private Long point_id; - - - /** - * 点位编码 - */ - private String point_code; - - - /** - * 点位名称 - */ - private String point_name; - - - /** - * 所属区域 - */ - private Long region_id; - - - /** - * 区域编码 - */ - private String region_code; - - - /** - * 区域名称 - */ - private String region_name; - - - /** - * 点位类型 - */ - private String point_type; - - - /** - * 点位状态 - */ - private String point_status; - - - /** - * 锁定类型 - */ - private String lock_type; - - - /** - * 物料标识 - */ - private Long material_id; - - - /** - * 设备编码 - */ - private String device_code; - - - /** - * MES设备编码 - */ - private String mes_device_code; - - - /** - * 允许的载具类型 - */ - private String can_vehicle_type; - - - /** - * 载具允许最大数量 - */ - private BigDecimal vehicle_max_qty; - - - /** - * 载具类型 - */ - private String vehicle_type; - - - /** - * 载具编码 - */ - private String vehicle_code; - - - /** - * 载具数量 - */ - private BigDecimal vehicle_qty; - - - /** - * 块 - */ - private BigDecimal block_num; - - - /** - * 排 - */ - private BigDecimal row_num; - - - /** - * 列 - */ - private BigDecimal col_num; - - - /** - * 层 - */ - private BigDecimal layer_num; - - - /** - * 入库顺序 - */ - private BigDecimal in_order_seq; - - - /** - * 出库顺序 - */ - private BigDecimal out_order_seq; - - - /** - * 入空载具顺序 - */ - private BigDecimal in_empty_seq; - - - /** - * 出空载具顺序 - */ - private BigDecimal out_empty_seq; - - - /** - * 点位组编码 - */ - private String point_group_code; - - - /** - * 是否建工单 - */ - private String is_have_workder; - - - /** - * 在执行的任务标识 - */ - private Long task_id; - - - /** - * 生产区域 - */ - private String product_area; - - - /** - * 备注 - */ - private String remark; - - - /** - * 来源标识 - */ - private Long source_id; - - - /** - * 是否启用 - */ - private String is_used; - - - /** - * 是否删除 - */ - @TableField(fill = FieldFill.INSERT) - private String is_delete; - - - - - /** - * 创建人 - */ - private Long create_id; - - - /** - * 创建人 - */ - private String create_name; - - - /** - * 创建时间 - */ - @TableField(fill = FieldFill.INSERT) - private String create_time; - - - - - /** - * 修改人 - */ - private Long update_optid; - - - /** - * 修改人 - */ - private String update_optname; - - - /** - * 修改时间 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private String update_time; - - - - /** - * 位置 - */ - private String point_location; - - - /** - * 物料编码 - */ - private String material_code; - + private static final long serialVersionUID = -7739291296662381393L; + //@TableId(value = "id", type = IdType.NONE) + + + /** + * 点位标识 + */ + private Long point_id; + + + /** + * 点位编码 + */ + private String point_code; + + + /** + * 点位名称 + */ + private String point_name; + + + /** + * 所属区域 + */ + private Long region_id; + + + /** + * 区域编码 + */ + private String region_code; + + + /** + * 区域名称 + */ + private String region_name; + + + /** + * 点位类型 + */ + private String point_type; + + + /** + * 点位状态 + */ + private String point_status; + + + /** + * 锁定类型 + */ + private String lock_type; + + + /** + * 物料标识 + */ + private Long material_id; + + + /** + * 设备编码 + */ + private String device_code; + + + /** + * MES设备编码 + */ + private String mes_device_code; + + + /** + * 允许的载具类型 + */ + private String can_vehicle_type; + + + /** + * 载具允许最大数量 + */ + private BigDecimal vehicle_max_qty; + + + /** + * 载具类型 + */ + private String vehicle_type; + + + /** + * 载具编码 + */ + private String vehicle_code; + + + /** + * 载具数量 + */ + private BigDecimal vehicle_qty; + + + /** + * 块 + */ + private BigDecimal block_num; + + + /** + * 排 + */ + private BigDecimal row_num; + + + /** + * 列 + */ + private BigDecimal col_num; + + + /** + * 层 + */ + private BigDecimal layer_num; + + + /** + * 入库顺序 + */ + private BigDecimal in_order_seq; + + + /** + * 出库顺序 + */ + private BigDecimal out_order_seq; + + + /** + * 入空载具顺序 + */ + private BigDecimal in_empty_seq; + + + /** + * 出空载具顺序 + */ + private BigDecimal out_empty_seq; + + + /** + * 点位组编码 + */ + private String point_group_code; + + + /** + * 是否建工单 + */ + private String is_have_workder; + + + /** + * 在执行的任务标识 + */ + private Long task_id; + + + /** + * 生产区域 + */ + private String product_area; + + + /** + * 备注 + */ + private String remark; + + + /** + * 来源标识 + */ + private Long source_id; + + + /** + * 是否启用 + */ + private String is_used; + + + /** + * 是否删除 + */ + private String is_delete; + + + /** + * 创建人 + */ + private Long create_id; + + + /** + * 创建人 + */ + private String create_name; + + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private String create_time; + + + /** + * 修改人 + */ + private Long update_optid; + + + /** + * 修改人 + */ + private String update_optname; + + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String update_time; + + + /** + * 位置 + */ + private String point_location; + + + /** + * 物料编码 + */ + private String material_code; + + + /** + * 获取主键值 + * + * @return 主键值 + */ + @Override + protected Serializable pkVal() { + return this.point_id; + } - - - /** - * 获取主键值 - * - * @return 主键值 - */ - @Override - protected Serializable pkVal() - { - return this.point_id; - } - } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtCoolpointivt.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtCoolpointivt.java new file mode 100644 index 000000000..6ad410780 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtCoolpointivt.java @@ -0,0 +1,211 @@ +package org.nl.b_lms.sch.point.dao; + +import java.math.BigDecimal; +import java.io.Serializable; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; + + +/** + * {@code @Description:} 冷却区点位库存表(StIvtCoolpointivt)实体类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("st_ivt_coolpointivt") +public class StIvtCoolpointivt extends Model { + + private static final long serialVersionUID = -7739291296662381393L; + //@TableId(value = "id", type = IdType.NONE) + + + /** + * 库存记录标识 + */ + private Long ivt_id; + + + /** + * 点位编码 + */ + private String point_code; + + + /** + * 满轴位编码 + */ + private String full_point_code; + + + /** + * 母卷号 + */ + private String container_name; + + + /** + * 母卷工单标识 + */ + private String workorder_id; + + + /** + * 母卷轴编码 + */ + private String full_vehicle_code; + + + /** + * 空轴位编码 + */ + private String empty_point_code; + + + /** + * 空轴编码 + */ + private String empty_vehicle_code; + + + /** + * 下料区域标识 + */ + private Long region_id; + + + /** + * 批次 + */ + private String pcsn; + + + /** + * 库存数 + */ + private BigDecimal ivt_qty; + + + /** + * 计量单位标识 + */ + private Long qty_unit_id; + + + /** + * 入库时间 + */ + private String instorage_time; + + + /** + * 生产区域 + */ + private String product_area; + + + /** + * 位置 + */ + private String point_location; + + + /** + * 顺序号 + */ + private BigDecimal sort_seq; + + + /** + * 是否启用 + */ + private String is_used; + + + /** + * 备注 + */ + private String remark; + + + /** + * 创建人 + */ + private Long create_id; + + + /** + * 创建人姓名 + */ + private String create_name; + + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private String create_time; + + + /** + * 修改人 + */ + private Long update_optid; + + + /** + * 修改人姓名 + */ + private String update_optname; + + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String update_time; + + + /** + * 规划 + */ + private String plan; + + + /** + * 满轴位状态 + */ + private String full_point_status; + + + /** + * 库存状态 + */ + private String cool_ivt_status; + + + /** + * 空轴位状态 + */ + private String empty_point_status; + + + /** + * 获取主键值 + * + * @return 主键值 + */ + @Override + protected Serializable pkVal() { + return this.ivt_id; + } + +} + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtCoolregionio.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtCoolregionio.java index 93ba547e0..c73f98260 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtCoolregionio.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtCoolregionio.java @@ -2,14 +2,9 @@ package org.nl.b_lms.sch.point.dao; import java.math.BigDecimal; import java.io.Serializable; -import java.math.BigDecimal; -import lombok.*; import lombok.Data; -import lombok.Builder; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; -import lombok.AllArgsConstructor; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -19,26 +14,20 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; * {@code @Description:} 冷却区出入表(StIvtCoolregionio)实体类 * {@code @Author:} gbx * - * @since 2024-01-24 + * @since 2024-02-27 */ @Data -@Builder -@ToString - -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@SuppressWarnings("serial") +@EqualsAndHashCode(callSuper = true) @TableName("st_ivt_coolregionio") public class StIvtCoolregionio extends Model { - private static final long serialVersionUID = -7739291296662381393L; + //@TableId(value = "id", type = IdType.NONE) /** * 出入单标识 */ - @TableId(value = "iostorinv_id", type = IdType.NONE) private Long iostorinv_id; @@ -185,7 +174,6 @@ public class StIvtCoolregionio extends Model { /** * 是否删除 */ - @TableField(fill = FieldFill.INSERT) private String is_delete; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtCutpointivt.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtCutpointivt.java index b341cb5b6..78fa446f0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtCutpointivt.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtCutpointivt.java @@ -2,14 +2,9 @@ package org.nl.b_lms.sch.point.dao; import java.math.BigDecimal; import java.io.Serializable; -import java.math.BigDecimal; -import lombok.*; import lombok.Data; -import lombok.Builder; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; -import lombok.AllArgsConstructor; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -19,25 +14,20 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; * {@code @Description:} 分切区点位库存表(StIvtCutpointivt)实体类 * {@code @Author:} gbx * - * @since 2024-01-24 + * @since 2024-02-27 */ @Data -@Builder -@ToString - -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@SuppressWarnings("serial") +@EqualsAndHashCode(callSuper = true) @TableName("st_ivt_cutpointivt") public class StIvtCutpointivt extends Model { private static final long serialVersionUID = -7739291296662381393L; + //@TableId(value = "id", type = IdType.NONE) /** * 库存记录标识 */ - @TableId(value = "ivt_id", type = IdType.NONE) private Long ivt_id; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtDeliverypointivt.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtDeliverypointivt.java index 5297e7ba0..d8ac789b6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtDeliverypointivt.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtDeliverypointivt.java @@ -2,14 +2,9 @@ package org.nl.b_lms.sch.point.dao; import java.math.BigDecimal; import java.io.Serializable; -import java.math.BigDecimal; -import lombok.*; import lombok.Data; -import lombok.Builder; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; -import lombok.AllArgsConstructor; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -19,23 +14,20 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; * {@code @Description:} 分切输送线点位库存表(StIvtDeliverypointivt)实体类 * {@code @Author:} gbx * - * @since 2024-01-24 + * @since 2024-02-27 */ @Data -@Builder -@ToString - -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@SuppressWarnings("serial") +@EqualsAndHashCode(callSuper = true) @TableName("st_ivt_deliverypointivt") public class StIvtDeliverypointivt extends Model { private static final long serialVersionUID = -7739291296662381393L; + //@TableId(value = "id", type = IdType.NONE) + + /** * 库存记录标识 */ - @TableId(value = "ivt_id", type = IdType.NONE) private Long ivt_id; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtEmptytubeivt.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtEmptytubeivt.java index 5cd0b9266..8945479a1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtEmptytubeivt.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtEmptytubeivt.java @@ -2,14 +2,9 @@ package org.nl.b_lms.sch.point.dao; import java.math.BigDecimal; import java.io.Serializable; -import java.math.BigDecimal; -import lombok.*; import lombok.Data; -import lombok.Builder; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; -import lombok.AllArgsConstructor; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -19,25 +14,20 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; * {@code @Description:} 空纸管库区点位库存表(StIvtEmptytubeivt)实体类 * {@code @Author:} gbx * - * @since 2024-01-24 + * @since 2024-02-27 */ @Data -@Builder -@ToString - -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@SuppressWarnings("serial") +@EqualsAndHashCode(callSuper = true) @TableName("st_ivt_emptytubeivt") public class StIvtEmptytubeivt extends Model { private static final long serialVersionUID = -7739291296662381393L; + //@TableId(value = "id", type = IdType.NONE) /** * 库存记录标识 */ - @TableId(value = "ivt_id", type = IdType.NONE) private Long ivt_id; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtEmptyvehiclerecord.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtEmptyvehiclerecord.java index 44583df84..376488d9f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtEmptyvehiclerecord.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtEmptyvehiclerecord.java @@ -2,14 +2,9 @@ package org.nl.b_lms.sch.point.dao; import java.math.BigDecimal; import java.io.Serializable; -import java.math.BigDecimal; -import lombok.*; import lombok.Data; -import lombok.Builder; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; -import lombok.AllArgsConstructor; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -19,24 +14,20 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; * {@code @Description:} 空载具作业记录表(StIvtEmptyvehiclerecord)实体类 * {@code @Author:} gbx * - * @since 2024-01-24 + * @since 2024-02-27 */ @Data -@Builder -@ToString -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@SuppressWarnings("serial") +@EqualsAndHashCode(callSuper = true) @TableName("st_ivt_emptyvehiclerecord") public class StIvtEmptyvehiclerecord extends Model { private static final long serialVersionUID = -7739291296662381393L; + //@TableId(value = "id", type = IdType.NONE) /** * 记录标识 */ - @TableId(value = "record_uuid", type = IdType.NONE) private Long record_uuid; @@ -141,7 +132,6 @@ public class StIvtEmptyvehiclerecord extends Model { /** * 是否删除 */ - @TableField(fill = FieldFill.INSERT) private String is_delete; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtHotpointivt.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtHotpointivt.java index 1ef267d21..dc6d3b8c6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtHotpointivt.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtHotpointivt.java @@ -2,14 +2,9 @@ package org.nl.b_lms.sch.point.dao; import java.math.BigDecimal; import java.io.Serializable; -import java.math.BigDecimal; -import lombok.*; import lombok.Data; -import lombok.Builder; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; -import lombok.AllArgsConstructor; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -19,25 +14,20 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; * {@code @Description:} 烘烤区点位库存表(StIvtHotpointivt)实体类 * {@code @Author:} gbx * - * @since 2024-01-24 + * @since 2024-02-27 */ @Data -@Builder -@ToString - -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@SuppressWarnings("serial") +@EqualsAndHashCode(callSuper = true) @TableName("st_ivt_hotpointivt") public class StIvtHotpointivt extends Model { private static final long serialVersionUID = -7739291296662381393L; + //@TableId(value = "id", type = IdType.NONE) /** * 库存记录标识 */ - @TableId(value = "ivt_id", type = IdType.NONE) private Long ivt_id; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtSbpointivt.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtSbpointivt.java index c8a1651bb..a73ec7fd1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtSbpointivt.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtSbpointivt.java @@ -1,14 +1,9 @@ package org.nl.b_lms.sch.point.dao; import java.io.Serializable; -import java.math.BigDecimal; -import lombok.*; import lombok.Data; -import lombok.Builder; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; -import lombok.AllArgsConstructor; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -18,24 +13,20 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; * {@code @Description:} 生箔点位库存表(StIvtSbpointivt)实体类 * {@code @Author:} gbx * - * @since 2024-01-24 + * @since 2024-02-27 */ @Data -@Builder -@ToString - -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) @TableName("st_ivt_sbpointivt") public class StIvtSbpointivt extends Model { private static final long serialVersionUID = -7739291296662381393L; + //@TableId(value = "id", type = IdType.NONE) /** * 点位标识 */ - @TableId(value = "point_id", type = IdType.NONE) private Long point_id; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtShaftivt.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtShaftivt.java index 5e9d4f5fd..cf2e649b0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtShaftivt.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/StIvtShaftivt.java @@ -2,14 +2,9 @@ package org.nl.b_lms.sch.point.dao; import java.math.BigDecimal; import java.io.Serializable; -import java.math.BigDecimal; -import lombok.*; import lombok.Data; -import lombok.Builder; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; -import lombok.AllArgsConstructor; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -19,25 +14,20 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; * {@code @Description:} 内包间点位库存表(StIvtShaftivt)实体类 * {@code @Author:} gbx * - * @since 2024-01-24 + * @since 2024-02-27 */ @Data -@Builder -@ToString - -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@SuppressWarnings("serial") +@EqualsAndHashCode(callSuper = true) @TableName("st_ivt_shaftivt") public class StIvtShaftivt extends Model { private static final long serialVersionUID = -7739291296662381393L; + //@TableId(value = "id", type = IdType.NONE) /** * 库存记录标识 */ - @TableId(value = "ivt_id", type = IdType.NONE) private Long ivt_id; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtDto.java new file mode 100644 index 000000000..c1251b81c --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtDto.java @@ -0,0 +1,99 @@ +package org.nl.b_lms.sch.point.dto; + +import java.math.BigDecimal; +import java.io.Serializable; + +import lombok.*; +import lombok.Data; +import lombok.Builder; + + +/** + * {@code @Description:} 装箱区点位库存表(BstIvtPackageinfoivt)数据传输类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BstIvtPackageinfoivtDto implements Serializable { + + /** + * 库存记录标识 + */ + private Long ivt_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 点位名称 + */ + private String point_name; + /** + * 子卷号 + */ + private String container_name; + /** + * 点位类型 + */ + private String point_status; + /** + * 库存状态 + */ + private String ivt_status; + /** + * 区块 + */ + private String block; + /** + * 位置 + */ + private String point_location; + /** + * 顺序号 + */ + private BigDecimal sort_seq; + /** + * 是否启用 + */ + private String is_used; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 规划 + */ + private String plan; + +} + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java new file mode 100644 index 000000000..3b1fb1399 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java @@ -0,0 +1,97 @@ +package org.nl.b_lms.sch.point.dto; + + +import java.math.BigDecimal; + +import lombok.Data; +import lombok.*; +import lombok.EqualsAndHashCode; +import org.nl.common.domain.query.BaseQuery; +import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; +import org.nl.b_lms.sch.point.dto.BstIvtPackageinfoivtVO; + +/** + * {@code @Description:} 装箱区点位库存表(BstIvtPackageinfoivt)查询参数类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class BstIvtPackageinfoivtVO extends BaseQuery { + /** + * 库存记录标识 + */ + private Long ivt_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 点位名称 + */ + private String point_name; + /** + * 子卷号 + */ + private String container_name; + /** + * 点位类型 + */ + private String point_status; + /** + * 库存状态 + */ + private String ivt_status; + /** + * 区块 + */ + private String block; + /** + * 位置 + */ + private String point_location; + /** + * 顺序号 + */ + private BigDecimal sort_seq; + /** + * 是否启用 + */ + private String is_used; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 规划 + */ + private String plan; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointDto.java new file mode 100644 index 000000000..2e2dbb854 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointDto.java @@ -0,0 +1,192 @@ +package org.nl.b_lms.sch.point.dto; + +import java.math.BigDecimal; +import java.io.Serializable; + +import lombok.*; +import lombok.Data; +import lombok.Builder; + + +/** + * {@code @Description:} 点位基础表(SchBasePoint)数据传输类 + * {@code @Author:} gbx + * + * @since 2024-02-28 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SchBasePointDto implements Serializable { + + private static final long serialVersionUID = -7739291296662381396L; + /** + * 点位标识 + */ + private Long point_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 点位名称 + */ + private String point_name; + /** + * 所属区域 + */ + private Long region_id; + /** + * 区域编码 + */ + private String region_code; + /** + * 区域名称 + */ + private String region_name; + /** + * 点位类型 + */ + private String point_type; + /** + * 点位状态 + */ + private String point_status; + /** + * 锁定类型 + */ + private String lock_type; + /** + * 物料标识 + */ + private Long material_id; + /** + * 设备编码 + */ + private String device_code; + /** + * MES设备编码 + */ + private String mes_device_code; + /** + * 允许的载具类型 + */ + private String can_vehicle_type; + /** + * 载具允许最大数量 + */ + private BigDecimal vehicle_max_qty; + /** + * 载具类型 + */ + private String vehicle_type; + /** + * 载具编码 + */ + private String vehicle_code; + /** + * 载具数量 + */ + private BigDecimal vehicle_qty; + /** + * 块 + */ + private BigDecimal block_num; + /** + * 排 + */ + private BigDecimal row_num; + /** + * 列 + */ + private BigDecimal col_num; + /** + * 层 + */ + private BigDecimal layer_num; + /** + * 入库顺序 + */ + private BigDecimal in_order_seq; + /** + * 出库顺序 + */ + private BigDecimal out_order_seq; + /** + * 入空载具顺序 + */ + private BigDecimal in_empty_seq; + /** + * 出空载具顺序 + */ + private BigDecimal out_empty_seq; + /** + * 点位组编码 + */ + private String point_group_code; + /** + * 是否建工单 + */ + private String is_have_workder; + /** + * 在执行的任务标识 + */ + private Long task_id; + /** + * 生产区域 + */ + private String product_area; + /** + * 备注 + */ + private String remark; + /** + * 来源标识 + */ + private Long source_id; + /** + * 是否启用 + */ + private String is_used; + /** + * 是否删除 + */ + private String is_delete; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 位置 + */ + private String point_location; + /** + * 物料编码 + */ + private String material_code; + +} + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointQuery.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointQuery.java deleted file mode 100644 index 8e0e60fb1..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointQuery.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.nl.b_lms.sch.point.dto; - - -import lombok.Data; -import lombok.Builder; -import lombok.EqualsAndHashCode; -import org.nl.b_lms.sch.point.dao.SchBasePoint; -import org.nl.common.domain.query.BaseQuery; - -/** - * {@code @Description:} 生箔点位库存表(StIvtSbpointivt)参数类 - * {@code @Author:} gbx - * - * @since 2024-01-24 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Builder - -public class SchBasePointQuery extends BaseQuery { - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointVO.java new file mode 100644 index 000000000..5aa9f7bb3 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointVO.java @@ -0,0 +1,189 @@ +package org.nl.b_lms.sch.point.dto; + + +import java.math.BigDecimal; + +import lombok.Data; +import lombok.*; +import lombok.EqualsAndHashCode; +import org.nl.common.domain.query.BaseQuery; +import org.nl.b_lms.sch.point.dao.SchBasePoint; + +/** + * {@code @Description:} 点位基础表(SchBasePoint)查询参数类 + * {@code @Author:} gbx + * + * @since 2024-02-28 + */ +@Data +@Builder +@ToString +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SchBasePointVO extends BaseQuery { + /** + * 点位标识 + */ + private Long point_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 点位名称 + */ + private String point_name; + /** + * 所属区域 + */ + private Long region_id; + /** + * 区域编码 + */ + private String region_code; + /** + * 区域名称 + */ + private String region_name; + /** + * 点位类型 + */ + private String point_type; + /** + * 点位状态 + */ + private String point_status; + /** + * 锁定类型 + */ + private String lock_type; + /** + * 物料标识 + */ + private Long material_id; + /** + * 设备编码 + */ + private String device_code; + /** + * MES设备编码 + */ + private String mes_device_code; + /** + * 允许的载具类型 + */ + private String can_vehicle_type; + /** + * 载具允许最大数量 + */ + private BigDecimal vehicle_max_qty; + /** + * 载具类型 + */ + private String vehicle_type; + /** + * 载具编码 + */ + private String vehicle_code; + /** + * 载具数量 + */ + private BigDecimal vehicle_qty; + /** + * 块 + */ + private BigDecimal block_num; + /** + * 排 + */ + private BigDecimal row_num; + /** + * 列 + */ + private BigDecimal col_num; + /** + * 层 + */ + private BigDecimal layer_num; + /** + * 入库顺序 + */ + private BigDecimal in_order_seq; + /** + * 出库顺序 + */ + private BigDecimal out_order_seq; + /** + * 入空载具顺序 + */ + private BigDecimal in_empty_seq; + /** + * 出空载具顺序 + */ + private BigDecimal out_empty_seq; + /** + * 点位组编码 + */ + private String point_group_code; + /** + * 是否建工单 + */ + private String is_have_workder; + /** + * 在执行的任务标识 + */ + private Long task_id; + /** + * 生产区域 + */ + private String product_area; + /** + * 备注 + */ + private String remark; + /** + * 来源标识 + */ + private Long source_id; + /** + * 是否启用 + */ + private String is_used; + /** + * 是否删除 + */ + private String is_delete; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 位置 + */ + private String point_location; + /** + * 物料编码 + */ + private String material_code; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCoolpointivtDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCoolpointivtDto.java new file mode 100644 index 000000000..49d823521 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCoolpointivtDto.java @@ -0,0 +1,139 @@ +package org.nl.b_lms.sch.point.dto; + +import java.math.BigDecimal; +import java.io.Serializable; + +import lombok.*; +import lombok.Data; +import lombok.Builder; + + +/** + * {@code @Description:} 冷却区点位库存表(StIvtCoolpointivt)数据传输类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class StIvtCoolpointivtDto implements Serializable { + + /** + * 库存记录标识 + */ + private Long ivt_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 满轴位编码 + */ + private String full_point_code; + /** + * 母卷号 + */ + private String container_name; + /** + * 母卷工单标识 + */ + private String workorder_id; + /** + * 母卷轴编码 + */ + private String full_vehicle_code; + /** + * 空轴位编码 + */ + private String empty_point_code; + /** + * 空轴编码 + */ + private String empty_vehicle_code; + /** + * 下料区域标识 + */ + private Long region_id; + /** + * 批次 + */ + private String pcsn; + /** + * 库存数 + */ + private BigDecimal ivt_qty; + /** + * 计量单位标识 + */ + private Long qty_unit_id; + /** + * 入库时间 + */ + private String instorage_time; + /** + * 生产区域 + */ + private String product_area; + /** + * 位置 + */ + private String point_location; + /** + * 顺序号 + */ + private BigDecimal sort_seq; + /** + * 是否启用 + */ + private String is_used; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人姓名 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人姓名 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 规划 + */ + private String plan; + /** + * 满轴位状态 + */ + private String full_point_status; + /** + * 库存状态 + */ + private String cool_ivt_status; + /** + * 空轴位状态 + */ + private String empty_point_status; + +} + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCoolpointivtVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCoolpointivtVO.java new file mode 100644 index 000000000..4b2a19504 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCoolpointivtVO.java @@ -0,0 +1,138 @@ +package org.nl.b_lms.sch.point.dto; + + +import java.math.BigDecimal; + +import lombok.Data; +import lombok.*; +import lombok.EqualsAndHashCode; +import org.nl.common.domain.query.BaseQuery; +import org.nl.b_lms.sch.point.dao.StIvtCoolpointivt; +import org.nl.b_lms.sch.point.dto.StIvtCoolpointivtVO; + +/** + * {@code @Description:} 冷却区点位库存表(StIvtCoolpointivt)查询参数类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@ToString +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class StIvtCoolpointivtVO extends BaseQuery { + /** + * 库存记录标识 + */ + private Long ivt_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 满轴位编码 + */ + private String full_point_code; + /** + * 母卷号 + */ + private String container_name; + /** + * 母卷工单标识 + */ + private String workorder_id; + /** + * 母卷轴编码 + */ + private String full_vehicle_code; + /** + * 空轴位编码 + */ + private String empty_point_code; + /** + * 空轴编码 + */ + private String empty_vehicle_code; + /** + * 下料区域标识 + */ + private Long region_id; + /** + * 批次 + */ + private String pcsn; + /** + * 库存数 + */ + private BigDecimal ivt_qty; + /** + * 计量单位标识 + */ + private Long qty_unit_id; + /** + * 入库时间 + */ + private String instorage_time; + /** + * 生产区域 + */ + private String product_area; + /** + * 位置 + */ + private String point_location; + /** + * 顺序号 + */ + private BigDecimal sort_seq; + /** + * 是否启用 + */ + private String is_used; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人姓名 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人姓名 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 规划 + */ + private String plan; + /** + * 满轴位状态 + */ + private String full_point_status; + /** + * 库存状态 + */ + private String cool_ivt_status; + /** + * 空轴位状态 + */ + private String empty_point_status; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCoolregionioDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCoolregionioDto.java new file mode 100644 index 000000000..620966dcd --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCoolregionioDto.java @@ -0,0 +1,127 @@ +package org.nl.b_lms.sch.point.dto; + +import java.math.BigDecimal; +import java.io.Serializable; + +import lombok.*; +import lombok.Data; +import lombok.Builder; + + +/** + * {@code @Description:} 冷却区出入表(StIvtCoolregionio)数据传输类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class StIvtCoolregionioDto implements Serializable { + + /** + * 出入单标识 + */ + private Long iostorinv_id; + /** + * 单据编号 + */ + private String bill_code; + /** + * 出入类型 + */ + private String io_type; + /** + * 物料标识 + */ + private Long material_id; + /** + * 批次 + */ + private String pcsn; + /** + * 载具编码 + */ + private String vehicle_code; + /** + * 数量 + */ + private BigDecimal qty; + /** + * 数量单位标识 + */ + private Long qty_unit_id; + /** + * 单据状态 + */ + private String bill_status; + /** + * 起始点位编码 + */ + private String start_point_code; + /** + * 终点点位编码 + */ + private String end_point_code; + /** + * 客户标识 + */ + private Long cust_id; + /** + * 生成方式 + */ + private String create_mode; + /** + * 任务标识 + */ + private Long task_id; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人姓名 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人姓名 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 确认人 + */ + private Long confirm_optid; + /** + * 确认人姓名 + */ + private String confirm_optname; + /** + * 确认时间 + */ + private String confirm_time; + /** + * 是否删除 + */ + private String is_delete; + +} + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCoolregionioVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCoolregionioVO.java new file mode 100644 index 000000000..dacc3aff9 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCoolregionioVO.java @@ -0,0 +1,125 @@ +package org.nl.b_lms.sch.point.dto; + + +import java.math.BigDecimal; + +import lombok.Data; +import lombok.*; +import lombok.EqualsAndHashCode; +import org.nl.common.domain.query.BaseQuery; +import org.nl.b_lms.sch.point.dao.StIvtCoolregionio; +import org.nl.b_lms.sch.point.dto.StIvtCoolregionioVO; + +/** + * {@code @Description:} 冷却区出入表(StIvtCoolregionio)查询参数类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class StIvtCoolregionioVO extends BaseQuery { + /** + * 出入单标识 + */ + private Long iostorinv_id; + /** + * 单据编号 + */ + private String bill_code; + /** + * 出入类型 + */ + private String io_type; + /** + * 物料标识 + */ + private Long material_id; + /** + * 批次 + */ + private String pcsn; + /** + * 载具编码 + */ + private String vehicle_code; + /** + * 数量 + */ + private BigDecimal qty; + /** + * 数量单位标识 + */ + private Long qty_unit_id; + /** + * 单据状态 + */ + private String bill_status; + /** + * 起始点位编码 + */ + private String start_point_code; + /** + * 终点点位编码 + */ + private String end_point_code; + /** + * 客户标识 + */ + private Long cust_id; + /** + * 生成方式 + */ + private String create_mode; + /** + * 任务标识 + */ + private Long task_id; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人姓名 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人姓名 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 确认人 + */ + private Long confirm_optid; + /** + * 确认人姓名 + */ + private String confirm_optname; + /** + * 确认时间 + */ + private String confirm_time; + /** + * 是否删除 + */ + private String is_delete; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCutpointivtDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCutpointivtDto.java new file mode 100644 index 000000000..66088e360 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCutpointivtDto.java @@ -0,0 +1,135 @@ +package org.nl.b_lms.sch.point.dto; + +import java.math.BigDecimal; +import java.io.Serializable; + +import lombok.*; +import lombok.Data; +import lombok.Builder; + + +/** + * {@code @Description:} 分切区点位库存表(StIvtCutpointivt)数据传输类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class StIvtCutpointivtDto implements Serializable { + + /** + * 库存记录标识 + */ + private Long ivt_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 满轴位编码 + */ + private String full_point_code; + /** + * 满轴位状态 + */ + private String full_point_status; + /** + * 母卷号 + */ + private String container_name; + /** + * 母卷轴编码 + */ + private String full_vehicle_code; + /** + * 空轴位编码 + */ + private String empty_point_code; + /** + * 空轴位状态 + */ + private String empty_point_status; + /** + * 空轴编码 + */ + private String empty_vehicle_code; + /** + * 生产区域 + */ + private String product_area; + /** + * 位置 + */ + private String point_location; + /** + * 分切下料位上轴点位 + */ + private String up_point_code; + /** + * 分切下料位下轴点位 + */ + private String down_point_code; + /** + * 顺序号 + */ + private BigDecimal sort_seq; + /** + * 是否启用 + */ + private String is_used; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人姓名 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人姓名 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 规划 + */ + private String plan; + /** + * 对应MES系统设备编码 + */ + private String ext_code; + /** + * 分切下料位上轴 + */ + private String up_qzzno; + /** + * 分切下料位下轴 + */ + private String down_qzzno; + /** + * 气胀轴代数 + */ + private String qzz_generation; + +} + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCutpointivtVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCutpointivtVO.java new file mode 100644 index 000000000..46d76b567 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtCutpointivtVO.java @@ -0,0 +1,134 @@ +package org.nl.b_lms.sch.point.dto; + + +import java.math.BigDecimal; + +import lombok.Data; +import lombok.*; +import lombok.EqualsAndHashCode; +import org.nl.common.domain.query.BaseQuery; +import org.nl.b_lms.sch.point.dao.StIvtCutpointivt; +import org.nl.b_lms.sch.point.dto.StIvtCutpointivtVO; + +/** + * {@code @Description:} 分切区点位库存表(StIvtCutpointivt)查询参数类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@ToString +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class StIvtCutpointivtVO extends BaseQuery { + /** + * 库存记录标识 + */ + private Long ivt_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 满轴位编码 + */ + private String full_point_code; + /** + * 满轴位状态 + */ + private String full_point_status; + /** + * 母卷号 + */ + private String container_name; + /** + * 母卷轴编码 + */ + private String full_vehicle_code; + /** + * 空轴位编码 + */ + private String empty_point_code; + /** + * 空轴位状态 + */ + private String empty_point_status; + /** + * 空轴编码 + */ + private String empty_vehicle_code; + /** + * 生产区域 + */ + private String product_area; + /** + * 位置 + */ + private String point_location; + /** + * 分切下料位上轴点位 + */ + private String up_point_code; + /** + * 分切下料位下轴点位 + */ + private String down_point_code; + /** + * 顺序号 + */ + private BigDecimal sort_seq; + /** + * 是否启用 + */ + private String is_used; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人姓名 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人姓名 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 规划 + */ + private String plan; + /** + * 对应MES系统设备编码 + */ + private String ext_code; + /** + * 分切下料位上轴 + */ + private String up_qzzno; + /** + * 分切下料位下轴 + */ + private String down_qzzno; + /** + * 气胀轴代数 + */ + private String qzz_generation; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtDeliverypointivtDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtDeliverypointivtDto.java new file mode 100644 index 000000000..7253217e4 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtDeliverypointivtDto.java @@ -0,0 +1,95 @@ +package org.nl.b_lms.sch.point.dto; + +import java.math.BigDecimal; +import java.io.Serializable; + +import lombok.*; +import lombok.Data; +import lombok.Builder; + + +/** + * {@code @Description:} 分切输送线点位库存表(StIvtDeliverypointivt)数据传输类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class StIvtDeliverypointivtDto implements Serializable { + + /** + * 库存记录标识 + */ + private Long ivt_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 生产区域 + */ + private String product_area; + /** + * 位置 + */ + private String point_location; + /** + * 顺序号 + */ + private BigDecimal sort_seq; + /** + * 是否启用 + */ + private String is_used; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人姓名 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人姓名 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 规划 + */ + private String plan; + /** + * 气涨轴编码 + */ + private String qzzno; + /** + * 载具码 + */ + private String vehicle_code; + /** + * 点位状态 + */ + private String point_status; + +} + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtDeliverypointivtVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtDeliverypointivtVO.java new file mode 100644 index 000000000..7f42f593d --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtDeliverypointivtVO.java @@ -0,0 +1,94 @@ +package org.nl.b_lms.sch.point.dto; + + +import java.math.BigDecimal; + +import lombok.Data; +import lombok.*; +import lombok.EqualsAndHashCode; +import org.nl.common.domain.query.BaseQuery; +import org.nl.b_lms.sch.point.dao.StIvtDeliverypointivt; + +/** + * {@code @Description:} 分切输送线点位库存表(StIvtDeliverypointivt)查询参数类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ + +@Data +@Builder +@ToString +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class StIvtDeliverypointivtVO extends BaseQuery { + /** + * 库存记录标识 + */ + private Long ivt_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 生产区域 + */ + private String product_area; + /** + * 位置 + */ + private String point_location; + /** + * 顺序号 + */ + private BigDecimal sort_seq; + /** + * 是否启用 + */ + private String is_used; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人姓名 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人姓名 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 规划 + */ + private String plan; + /** + * 气涨轴编码 + */ + private String qzzno; + /** + * 载具码 + */ + private String vehicle_code; + /** + * 点位状态 + */ + private String point_status; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtEmptytubeivtDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtEmptytubeivtDto.java new file mode 100644 index 000000000..2263d8b6b --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtEmptytubeivtDto.java @@ -0,0 +1,91 @@ +package org.nl.b_lms.sch.point.dto; + +import java.math.BigDecimal; +import java.io.Serializable; + +import lombok.*; +import lombok.Data; +import lombok.Builder; + + +/** + * {@code @Description:} 空纸管库区点位库存表(StIvtEmptytubeivt)数据传输类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class StIvtEmptytubeivtDto implements Serializable { + + /** + * 库存记录标识 + */ + private Long ivt_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 生产区域 + */ + private String product_area; + /** + * 物料编码 + */ + private String material_code; + /** + * 物料名称 + */ + private String material_name; + /** + * 数量 + */ + private BigDecimal qty; + /** + * 顺序号 + */ + private BigDecimal sort_seq; + /** + * 是否启用 + */ + private String is_used; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 规划 + */ + private String plan; + +} + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtEmptytubeivtVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtEmptytubeivtVO.java new file mode 100644 index 000000000..6b77718a6 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtEmptytubeivtVO.java @@ -0,0 +1,89 @@ +package org.nl.b_lms.sch.point.dto; + + +import java.math.BigDecimal; + +import lombok.Data; +import lombok.*; +import lombok.EqualsAndHashCode; +import org.nl.common.domain.query.BaseQuery; +import org.nl.b_lms.sch.point.dao.StIvtEmptytubeivt; +import org.nl.b_lms.sch.point.dto.StIvtEmptytubeivtVO; + +/** + * {@code @Description:} 空纸管库区点位库存表(StIvtEmptytubeivt)查询参数类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class StIvtEmptytubeivtVO extends BaseQuery { + /** + * 库存记录标识 + */ + private Long ivt_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 生产区域 + */ + private String product_area; + /** + * 物料编码 + */ + private String material_code; + /** + * 物料名称 + */ + private String material_name; + /** + * 数量 + */ + private BigDecimal qty; + /** + * 顺序号 + */ + private BigDecimal sort_seq; + /** + * 是否启用 + */ + private String is_used; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 规划 + */ + private String plan; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtEmptyvehiclerecordDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtEmptyvehiclerecordDto.java new file mode 100644 index 000000000..40c9deeee --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtEmptyvehiclerecordDto.java @@ -0,0 +1,99 @@ +package org.nl.b_lms.sch.point.dto; + +import java.math.BigDecimal; +import java.io.Serializable; + +import lombok.*; +import lombok.Data; +import lombok.Builder; + + +/** + * {@code @Description:} 空载具作业记录表(StIvtEmptyvehiclerecord)数据传输类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class StIvtEmptyvehiclerecordDto implements Serializable { + + /** + * 记录标识 + */ + private Long record_uuid; + /** + * 单据编号 + */ + private String bill_code; + /** + * 单据类型 + */ + private String io_type; + /** + * 单据状态 + */ + private String bill_status; + /** + * 载具数量 + */ + private BigDecimal vehicle_qty; + /** + * 起始点位 + */ + private String start_point_code; + /** + * 下一点位 + */ + private String next_point_code; + /** + * 起始区域 + */ + private Long start_region_id; + /** + * 终点区域 + */ + private Long end_region_id; + /** + * 任务标识 + */ + private Long task_uuid; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人姓名 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人姓名 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 是否删除 + */ + private String is_delete; + +} + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtEmptyvehiclerecordVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtEmptyvehiclerecordVO.java new file mode 100644 index 000000000..b177db382 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtEmptyvehiclerecordVO.java @@ -0,0 +1,97 @@ +package org.nl.b_lms.sch.point.dto; + + +import java.math.BigDecimal; + +import lombok.Data; +import lombok.*; +import lombok.EqualsAndHashCode; +import org.nl.common.domain.query.BaseQuery; +import org.nl.b_lms.sch.point.dao.StIvtEmptyvehiclerecord; +import org.nl.b_lms.sch.point.dto.StIvtEmptyvehiclerecordVO; + +/** + * {@code @Description:} 空载具作业记录表(StIvtEmptyvehiclerecord)查询参数类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class StIvtEmptyvehiclerecordVO extends BaseQuery { + /** + * 记录标识 + */ + private Long record_uuid; + /** + * 单据编号 + */ + private String bill_code; + /** + * 单据类型 + */ + private String io_type; + /** + * 单据状态 + */ + private String bill_status; + /** + * 载具数量 + */ + private BigDecimal vehicle_qty; + /** + * 起始点位 + */ + private String start_point_code; + /** + * 下一点位 + */ + private String next_point_code; + /** + * 起始区域 + */ + private Long start_region_id; + /** + * 终点区域 + */ + private Long end_region_id; + /** + * 任务标识 + */ + private Long task_uuid; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人姓名 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人姓名 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 是否删除 + */ + private String is_delete; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtHotpointivtDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtHotpointivtDto.java new file mode 100644 index 000000000..9890aa6a7 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtHotpointivtDto.java @@ -0,0 +1,131 @@ +package org.nl.b_lms.sch.point.dto; + +import java.math.BigDecimal; +import java.io.Serializable; + +import lombok.*; +import lombok.Data; +import lombok.Builder; + + +/** + * {@code @Description:} 烘烤区点位库存表(StIvtHotpointivt)数据传输类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class StIvtHotpointivtDto implements Serializable { + + /** + * 库存记录标识 + */ + private Long ivt_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 点位状态 + */ + private String point_status; + /** + * 母卷号 + */ + private String container_name; + /** + * 母卷工单标识 + */ + private String workorder_id; + /** + * 母卷轴编码 + */ + private String full_vehicle_code; + /** + * 批次 + */ + private String pcsn; + /** + * 库存数 + */ + private BigDecimal ivt_qty; + /** + * 计量单位标识 + */ + private Long qty_unit_id; + /** + * 入库时间 + */ + private String instorage_time; + /** + * 生产区域 + */ + private String product_area; + /** + * 温度 + */ + private BigDecimal temperature; + /** + * 组别 + */ + private String group_name; + /** + * 位置 + */ + private String point_location; + /** + * 顺序号 + */ + private BigDecimal sort_seq; + /** + * 是否启用 + */ + private String is_used; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人姓名 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人姓名 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 规划 + */ + private String plan; + /** + * 外部编码 + */ + private String ext_code; + /** + * 倒计时 + */ + private String last_time; + +} + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtHotpointivtVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtHotpointivtVO.java new file mode 100644 index 000000000..986008742 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtHotpointivtVO.java @@ -0,0 +1,129 @@ +package org.nl.b_lms.sch.point.dto; + + +import java.math.BigDecimal; + +import lombok.Data; +import lombok.*; +import lombok.EqualsAndHashCode; +import org.nl.common.domain.query.BaseQuery; +import org.nl.b_lms.sch.point.dao.StIvtHotpointivt; +import org.nl.b_lms.sch.point.dto.StIvtHotpointivtVO; + +/** + * {@code @Description:} 烘烤区点位库存表(StIvtHotpointivt)查询参数类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class StIvtHotpointivtVO extends BaseQuery { + /** + * 库存记录标识 + */ + private Long ivt_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 点位状态 + */ + private String point_status; + /** + * 母卷号 + */ + private String container_name; + /** + * 母卷工单标识 + */ + private String workorder_id; + /** + * 母卷轴编码 + */ + private String full_vehicle_code; + /** + * 批次 + */ + private String pcsn; + /** + * 库存数 + */ + private BigDecimal ivt_qty; + /** + * 计量单位标识 + */ + private Long qty_unit_id; + /** + * 入库时间 + */ + private String instorage_time; + /** + * 生产区域 + */ + private String product_area; + /** + * 温度 + */ + private BigDecimal temperature; + /** + * 组别 + */ + private String group_name; + /** + * 位置 + */ + private String point_location; + /** + * 顺序号 + */ + private BigDecimal sort_seq; + /** + * 是否启用 + */ + private String is_used; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人姓名 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人姓名 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 规划 + */ + private String plan; + /** + * 外部编码 + */ + private String ext_code; + /** + * 倒计时 + */ + private String last_time; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtSbpointivtDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtSbpointivtDto.java new file mode 100644 index 000000000..aec94b39a --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtSbpointivtDto.java @@ -0,0 +1,90 @@ +package org.nl.b_lms.sch.point.dto; + +import java.io.Serializable; + +import lombok.*; +import lombok.Data; +import lombok.Builder; + + +/** + * {@code @Description:} 生箔点位库存表(StIvtSbpointivt)数据传输类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class StIvtSbpointivtDto implements Serializable { + + /** + * 点位标识 + */ + private Long point_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 载具编码 + */ + private String vehicle_code; + /** + * 生产区域 + */ + private String product_area; + /** + * 位置 + */ + private String point_location; + /** + * 外部编码 + */ + private String ext_code; + /** + * 备注 + */ + private String remark; + /** + * 是否启用 + */ + private String is_used; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 规划 + */ + private String plan; + /** + * MES启用 + */ + private String mes_used; + +} + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtSbpointivtVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtSbpointivtVO.java new file mode 100644 index 000000000..b315faebd --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtSbpointivtVO.java @@ -0,0 +1,87 @@ +package org.nl.b_lms.sch.point.dto; + + +import lombok.Data; +import lombok.*; +import lombok.EqualsAndHashCode; +import org.nl.common.domain.query.BaseQuery; +import org.nl.b_lms.sch.point.dao.StIvtSbpointivt; + + +/** + * {@code @Description:} 生箔点位库存表(StIvtSbpointivt)查询参数类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class StIvtSbpointivtVO extends BaseQuery { + /** + * 点位标识 + */ + private Long point_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 载具编码 + */ + private String vehicle_code; + /** + * 生产区域 + */ + private String product_area; + /** + * 位置 + */ + private String point_location; + /** + * 外部编码 + */ + private String ext_code; + /** + * 备注 + */ + private String remark; + /** + * 是否启用 + */ + private String is_used; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 规划 + */ + private String plan; + /** + * MES启用 + */ + private String mes_used; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtShaftivtDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtShaftivtDto.java new file mode 100644 index 000000000..0d65035b6 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtShaftivtDto.java @@ -0,0 +1,131 @@ +package org.nl.b_lms.sch.point.dto; + +import java.math.BigDecimal; +import java.io.Serializable; + +import lombok.*; +import lombok.Data; +import lombok.Builder; + + +/** + * {@code @Description:} 内包间点位库存表(StIvtShaftivt)数据传输类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class StIvtShaftivtDto implements Serializable { + + /** + * 库存记录标识 + */ + private Long ivt_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 生产区域 + */ + private String product_area; + /** + * 是否有轴 + */ + private String have_qzz; + /** + * 气涨轴尺寸 + */ + private String qzz_size; + /** + * 气涨轴代数 + */ + private String qzz_generation; + /** + * 纸管1编码 + */ + private String tube_code1; + /** + * 纸管1描述 + */ + private String tube_name1; + /** + * 纸管2编码 + */ + private String tube_code2; + /** + * 纸管2描述 + */ + private String tube_name2; + /** + * 点位类型 + */ + private String point_type; + /** + * 排 + */ + private BigDecimal row_num; + /** + * 列 + */ + private BigDecimal col_num; + /** + * 层 + */ + private BigDecimal layer_num; + /** + * 顺序号 + */ + private BigDecimal sort_seq; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 规划 + */ + private String plan; + /** + * 子卷号1 + */ + private String container_name1; + /** + * 子卷号2 + */ + private String container_name2; + /** + * 位置 + */ + private String point_location; + /** + * 是否启用 + */ + private String is_used; + +} + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtShaftivtVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtShaftivtVO.java new file mode 100644 index 000000000..e1d4b55c3 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/StIvtShaftivtVO.java @@ -0,0 +1,129 @@ +package org.nl.b_lms.sch.point.dto; + + +import java.math.BigDecimal; + +import lombok.Data; +import lombok.*; +import lombok.EqualsAndHashCode; +import org.nl.common.domain.query.BaseQuery; +import org.nl.b_lms.sch.point.dao.StIvtShaftivt; +import org.nl.b_lms.sch.point.dto.StIvtShaftivtVO; + +/** + * {@code @Description:} 内包间点位库存表(StIvtShaftivt)查询参数类 + * {@code @Author:} gbx + * + * @since 2024-02-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class StIvtShaftivtVO extends BaseQuery { + /** + * 库存记录标识 + */ + private Long ivt_id; + /** + * 点位编码 + */ + private String point_code; + /** + * 生产区域 + */ + private String product_area; + /** + * 是否有轴 + */ + private String have_qzz; + /** + * 气涨轴尺寸 + */ + private String qzz_size; + /** + * 气涨轴代数 + */ + private String qzz_generation; + /** + * 纸管1编码 + */ + private String tube_code1; + /** + * 纸管1描述 + */ + private String tube_name1; + /** + * 纸管2编码 + */ + private String tube_code2; + /** + * 纸管2描述 + */ + private String tube_name2; + /** + * 点位类型 + */ + private String point_type; + /** + * 排 + */ + private BigDecimal row_num; + /** + * 列 + */ + private BigDecimal col_num; + /** + * 层 + */ + private BigDecimal layer_num; + /** + * 顺序号 + */ + private BigDecimal sort_seq; + /** + * 创建人 + */ + private Long create_id; + /** + * 创建人 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private Long update_optid; + /** + * 修改人 + */ + private String update_optname; + /** + * 修改时间 + */ + private String update_time; + /** + * 规划 + */ + private String plan; + /** + * 子卷号1 + */ + private String container_name1; + /** + * 子卷号2 + */ + private String container_name2; + /** + * 位置 + */ + private String point_location; + /** + * 是否启用 + */ + private String is_used; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/dao/SchBaseRegion.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/dao/SchBaseRegion.java index db14adc03..0e9e37011 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/dao/SchBaseRegion.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/region/dao/SchBaseRegion.java @@ -14,13 +14,13 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; * * @since 2024-01-23 19:45:03 */ + @Data @Builder @ToString - @AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@SuppressWarnings("serial") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) @TableName("sch_base_region") public class SchBaseRegion extends Model { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/SchBaseTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/SchBaseTask.java index 6b1199278..46e059d4a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/SchBaseTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/SchBaseTask.java @@ -18,7 +18,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; @Data @ToString @EqualsAndHashCode(callSuper = false) -@SuppressWarnings("serial") @TableName("sch_base_task") public class SchBaseTask extends Model { @@ -28,7 +27,7 @@ public class SchBaseTask extends Model { /** * 任务标识 */ - @TableId(value = "task_id", type = IdType.NONE) + @TableId(value = "task_id",type = IdType.NONE) private String task_id; @@ -221,7 +220,6 @@ public class SchBaseTask extends Model { /** * 是否删除 */ - @TableField(fill = FieldFill.INSERT) private String is_delete; @@ -240,7 +238,6 @@ public class SchBaseTask extends Model { /** * 创建时间 */ - @TableField(fill = FieldFill.INSERT) private String create_time; @@ -259,7 +256,6 @@ public class SchBaseTask extends Model { /** * 修改时间 */ - @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; @@ -280,6 +276,8 @@ public class SchBaseTask extends Model { */ private String is_send; + + /** * 获取主键值 * diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dto/SchBaseTaskQuery.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dto/SchBaseTaskQuery.java deleted file mode 100644 index 1cee22133..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dto/SchBaseTaskQuery.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.nl.b_lms.sch.task.dto; - - -import java.math.BigDecimal; - - -import lombok.Data; -import lombok.Builder; -import lombok.NoArgsConstructor; -import org.nl.b_lms.sch.task.dao.SchBaseTask; -import org.nl.common.domain.query.BaseQuery; - -/** - * @Author: gbx - * @since 2024-01-23 16:07:13 - */ -@Data -@Builder - -public class SchBaseTaskQuery extends BaseQuery { - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dto/SchBaseTaskVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dto/SchBaseTaskVO.java new file mode 100644 index 000000000..18b0aad4d --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dto/SchBaseTaskVO.java @@ -0,0 +1,272 @@ +package org.nl.b_lms.sch.task.dto; + + +import java.math.BigDecimal; + + +import lombok.*; +import org.nl.b_lms.sch.task.dao.SchBaseTask; +import org.nl.common.domain.query.BaseQuery; + +/** + * @Author: gbx + * @since 2024-01-23 16:07:13 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SchBaseTaskVO extends BaseQuery { + + /** + * 任务标识 + */ + private String task_id; + + + /** + * 任务编码 + */ + private String task_code; + + + /** + * 任务名称 + */ + private String task_name; + + + /** + * 任务类型 + */ + private String task_type; + + + /** + * 任务状态 + */ + private String task_status; + + + /** + * 任务执行步骤 + */ + private BigDecimal task_step; + + + /** + * 点位1 + */ + private String point_code1; + + + /** + * 点位2 + */ + private String point_code2; + + + /** + * 点位3 + */ + private String point_code3; + + + /** + * 点位4 + */ + private String point_code4; + + + /** + * 搬运物料信息 + */ + private String material_info_id; + + + /** + * 物料信息 + */ + private String material_id; + + + /** + * 物料数量 + */ + private BigDecimal material_qty; + + + /** + * 载具类型 + */ + private String vehicle_type; + + + /** + * 载具数量 + */ + private BigDecimal vehicle_qty; + + + /** + * 载具编码 + */ + private String vehicle_code; + + + /** + * 优先级 + */ + private String priority; + + + /** + * 处理类 + */ + private String handle_class; + + + /** + * 车号 + */ + private String car_no; + + + /** + * 是否自动下发 + */ + private String is_auto_issue; + + + /** + * 任务组标识 + */ + private String task_group_id; + + + /** + * 任务组顺序号 + */ + private BigDecimal sort_seq; + + + /** + * 任务完成类型 + */ + private String finished_type; + + + /** + * acs任务类型 + */ + private String acs_task_type; + + + /** + * 生成方式 + */ + private String create_mode; + + + /** + * 业务表表名 + */ + private String table_name; + + + /** + * 业务表表名主键字段 + */ + private String table_fk; + + + /** + * 业务表表名主键值 + */ + private String table_fk_id; + + + /** + * 生成任务的请求参数 + */ + private String request_param; + + + /** + * 下发任务的请求参数 + */ + private String response_param; + + + /** + * 生产区域 + */ + private String product_area; + + + /** + * 备注 + */ + private String remark; + + + /** + * 是否删除 + */ + private String is_delete; + + + /** + * 创建人 + */ + private String create_id; + + + /** + * 创建人 + */ + private String create_name; + + + /** + * 创建时间 + */ + private String create_time; + + + /** + * 修改人 + */ + private String update_optid; + + + /** + * 修改人 + */ + private String update_optname; + + + /** + * 修改时间 + */ + private String update_time; + + + /** + * 物料编码 + */ + private String material_code; + + + /** + * 载具编码 + */ + private String vehicle_code2; + + + /** + * 是否立即下发 + */ + private String is_send; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java index 704921cfd..09bdb9892 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java @@ -31,8 +31,6 @@ import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java index 6c5f15ee7..7d4fb9651 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java @@ -3,7 +3,6 @@ package org.nl.b_lms.sch.tasks.first_floor_area; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.BooleanUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -14,7 +13,9 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; +import org.nl.b_lms.sch.region.dao.SchBaseRegion; import org.nl.b_lms.sch.task.dao.SchBaseTask; +import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; @@ -23,6 +24,7 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -85,9 +87,7 @@ public class DjqTask extends AbstractAcsTask { @Override @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject taskObj, String status) { - SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(taskObj.getString("task_code")), SchBaseTask::getTask_code, taskObj.getString("task_code")), false); - ; + SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper().eq(StringUtils.isNotBlank(taskObj.getString("task_id")), SchBaseTask::getTask_id, taskObj.getString("task_id")), false); if (schBaseTask == null) { throw new BadRequestException("满轴缓存位 -> 待检区更新接口任务号为空！"); } @@ -144,7 +144,7 @@ public class DjqTask extends AbstractAcsTask { schBaseTask.setIs_delete(IOSEnum.IS_NOTANDYES.code("是")); } schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } @@ -152,76 +152,79 @@ public class DjqTask extends AbstractAcsTask { @Override public String createTask(JSONObject form) { Assert.notNull(form, "请求参数不能为空"); - String task_type = form.getString("task_type"); - if (StrUtil.isBlank(task_type)) { + String taskType = form.getString("task_type"); + if (StrUtil.isBlank(taskType)) { throw new BadRequestException("业务类型不能为空"); } - String vehicle_code = form.getString("vehicle_code"); - if (StrUtil.isBlank(vehicle_code)) { + String vehicleCode = form.getString("vehicle_code"); + if (StrUtil.isBlank(vehicleCode)) { throw new BadRequestException("载具号不能为空"); } - String point_code1 = form.getString("point_code1"); - if (StrUtil.isBlank(point_code1)) { + String pointCode1 = form.getString("point_code1"); + if (StrUtil.isBlank(pointCode1)) { throw new BadRequestException("起点不能为空"); } - String point_code2 = form.getString("point_code2"); - if (StrUtil.isBlank(point_code2)) { + String pointCode2 = form.getString("point_code2"); + if (StrUtil.isBlank(pointCode2)) { throw new BadRequestException("下一点不能为空"); } - JSONObject json = new JSONObject(); - String point_code3 = form.getString("point_code3"); - String point_code4 = form.getString("point_code4"); - json.put("vehicle_code", form.getString("vehicle_code")); - json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); - json.put("task_code", IdUtil.getSnowflake(1, 1).nextId()); - json.put("task_type", form.getString("task_type")); - json.put("priority", "1"); - json.put("point_code1", point_code1); - json.put("point_code2", point_code2); - json.put("point_code3", point_code3); - json.put("point_code4", point_code4); - json.put("handle_class", this.getClass().getName()); - json.put("create_id", SecurityUtils.getCurrentUserId()); - json.put("create_name", SecurityUtils.getCurrentUsername()); - json.put("create_time", DateUtil.now()); - json.put("task_status", StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")); + //是否立即下发 boolean isSend = !StrUtil.isNotBlank(form.getString("is_send")) || BooleanUtil.toBoolean(form.getString("is_send")); - json.put("is_send", isSend); - json.put("product_area", form.getString("product_area")); - taskService.save(json.toJavaObject(SchBaseTask.class)); + SchBaseTaskVO schBaseTaskVo = SchBaseTaskVO.builder() + .task_type(taskType) + .vehicle_code(vehicleCode) + .point_code1(pointCode1) + .point_code2(pointCode2) + .point_code3(form.getString("point_code3")) + .point_code4(form.getString("point_code4")) + .task_id(org.nl.common.utils.IdUtil.getStringId()) + .task_code(org.nl.common.utils.IdUtil.getStringId()) + .handle_class(this.getClass().getName()) + .create_id(SecurityUtils.getCurrentUserId()) + .create_name(SecurityUtils.getCurrentUsername()) + .create_time(DateUtil.now()) + .is_send(isSend ? "1" : "0") + .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type")) + .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")) + .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "A1" : form.getString("product_area")) + .build(); + SchBaseTask task = new SchBaseTask(); + BeanUtils.copyProperties(schBaseTaskVo, task); + taskService.save(task); //如果目标点位没有空位先创建不下发 if (isSend) { - this.immediateNotifyAcs(json.getString("task_id")); + this.immediateNotifyAcs(null); } - return json.getString("task_id"); + return task.getTask_id().toString(); } @Override - public void forceFinish(String task_id) { + public void forceFinish(String taskId) { + + SchBaseRegion ss =new SchBaseRegion(); SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(task_id), SchBaseTask::getTask_id, task_id), false); + .eq(SchBaseTask::getTask_id, taskId), false); if (schBaseTask == null) { throw new BadRequestException("满轴缓存位 -> 待检区强制完成接口任务号为空！"); } schBaseTask.setTask_status(TaskStatusEnum.FINISHED.getCode()); - schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } @Override - public void cancel(String task_id) { + public void cancel(String taskId) { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(task_id), SchBaseTask::getTask_id, task_id), false); + .eq(SchBaseTask::getTask_id, taskId), false); if (schBaseTask == null) { throw new BadRequestException("满轴缓存位 -> 待检区取消接口任务号为空！"); } schBaseTask.setTask_status(IOSEnum.ACS_RESULT.code("取消")); schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java index 5ab6aa1a6..5b7acbc68 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java @@ -1,9 +1,7 @@ package org.nl.b_lms.sch.tasks.first_floor_area; - import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.BooleanUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -15,6 +13,7 @@ import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; +import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; @@ -23,9 +22,9 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -82,9 +81,7 @@ public class GzqTask extends AbstractAcsTask { @Override @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject taskObj, String status) { - SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(taskObj.getString("task_code")), SchBaseTask::getTask_code, taskObj.getString("task_code")), false); - ; + SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper().eq(StringUtils.isNotBlank(taskObj.getString("task_id")), SchBaseTask::getTask_id, taskObj.getString("task_id")), false); if (schBaseTask == null) { throw new BadRequestException("满轴缓存位 -> 管制区更新接口任务号为空！"); } @@ -121,7 +118,7 @@ public class GzqTask extends AbstractAcsTask { schBaseTask.setIs_delete(IOSEnum.IS_NOTANDYES.code("是")); } schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } @@ -129,76 +126,77 @@ public class GzqTask extends AbstractAcsTask { @Override public String createTask(JSONObject form) { Assert.notNull(form, "请求参数不能为空"); - String task_type = form.getString("task_type"); - if (StrUtil.isBlank(task_type)) { + String taskType = form.getString("task_type"); + if (StrUtil.isBlank(taskType)) { throw new BadRequestException("业务类型不能为空"); } - String vehicle_code = form.getString("vehicle_code"); - if (StrUtil.isBlank(vehicle_code)) { + String vehicleCode = form.getString("vehicle_code"); + if (StrUtil.isBlank(vehicleCode)) { throw new BadRequestException("载具号不能为空"); } - String point_code1 = form.getString("point_code1"); - if (StrUtil.isBlank(point_code1)) { + String pointCode1 = form.getString("point_code1"); + if (StrUtil.isBlank(pointCode1)) { throw new BadRequestException("起点不能为空"); } - String point_code2 = form.getString("point_code2"); - if (StrUtil.isBlank(point_code2)) { + String pointCode2 = form.getString("point_code2"); + if (StrUtil.isBlank(pointCode2)) { throw new BadRequestException("下一点不能为空"); } - JSONObject json = new JSONObject(); - String point_code3 = form.getString("point_code3"); - String point_code4 = form.getString("point_code4"); - json.put("vehicle_code", form.getString("vehicle_code")); - json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); - json.put("task_code", IdUtil.getSnowflake(1, 1).nextId()); - json.put("task_type", form.getString("task_type")); - json.put("priority", "1"); - json.put("point_code1", point_code1); - json.put("point_code2", point_code2); - json.put("point_code3", point_code3); - json.put("point_code4", point_code4); - json.put("handle_class", this.getClass().getName()); - json.put("create_id", SecurityUtils.getCurrentUserId()); - json.put("create_name", SecurityUtils.getCurrentUsername()); - json.put("create_time", DateUtil.now()); - json.put("task_status", StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")); + //是否立即下发 boolean isSend = !StrUtil.isNotBlank(form.getString("is_send")) || BooleanUtil.toBoolean(form.getString("is_send")); - json.put("is_send", isSend); - json.put("product_area", form.getString("product_area")); - taskService.save(json.toJavaObject(SchBaseTask.class)); + SchBaseTaskVO schBaseTaskVo = SchBaseTaskVO.builder() + .task_type(taskType) + .vehicle_code(vehicleCode) + .point_code1(pointCode1) + .point_code2(pointCode2) + .point_code3(form.getString("point_code3")) + .point_code4(form.getString("point_code4")) + .task_id(org.nl.common.utils.IdUtil.getStringId()) + .task_code(org.nl.common.utils.IdUtil.getStringId()) + .handle_class(this.getClass().getName()) + .create_id(SecurityUtils.getCurrentUserId()) + .create_name(SecurityUtils.getCurrentUsername()) + .create_time(DateUtil.now()) + .is_send(isSend ? "1" : "0") + .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type")) + .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")) + .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "A1" : form.getString("product_area")) + .build(); + SchBaseTask task = new SchBaseTask(); + BeanUtils.copyProperties(schBaseTaskVo, task); + taskService.save(task); //如果目标点位没有空位先创建不下发 if (isSend) { - this.immediateNotifyAcs(json.getString("task_id")); + this.immediateNotifyAcs(null); } - return json.getString("task_id"); + return task.getTask_id().toString(); } @Override - public void forceFinish(String task_id) { + public void forceFinish(String taskId) { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(task_id), SchBaseTask::getTask_id, task_id), false); + .eq(SchBaseTask::getTask_id, taskId), false); if (schBaseTask == null) { throw new BadRequestException("满轴缓存位 -> 管制区强制完成接口任务号为空！"); } schBaseTask.setTask_status(TaskStatusEnum.FINISHED.getCode()); - schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } @Override - public void cancel(String task_id) { + public void cancel(String taskId) { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(task_id), SchBaseTask::getTask_id, task_id), false); + .eq(SchBaseTask::getTask_id, taskId), false); if (schBaseTask == null) { throw new BadRequestException("满轴缓存位 -> 管制区取消接口任务号为空！"); } schBaseTask.setTask_status(IOSEnum.ACS_RESULT.code("取消")); schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/KzjhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/KzjhcwTask.java index ec58d79c4..adcdacdc4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/KzjhcwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/KzjhcwTask.java @@ -3,7 +3,6 @@ package org.nl.b_lms.sch.tasks.first_floor_area; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.BooleanUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -15,6 +14,7 @@ import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; +import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; @@ -23,9 +23,9 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -88,8 +88,7 @@ public class KzjhcwTask extends AbstractAcsTask { @Override @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject taskObj, String status) { - SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(taskObj.getString("task_code")), SchBaseTask::getTask_code, taskObj.getString("task_code")), false); + SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper().eq(StringUtils.isNotBlank(taskObj.getString("task_id")), SchBaseTask::getTask_id, taskObj.getString("task_id")), false); ; if (schBaseTask == null) { throw new BadRequestException("待检区或管制区 -> 空载具缓存位更新接口任务号为空！"); @@ -136,7 +135,7 @@ public class KzjhcwTask extends AbstractAcsTask { schBaseTask.setIs_delete(IOSEnum.IS_NOTANDYES.code("是")); } schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } @@ -144,75 +143,76 @@ public class KzjhcwTask extends AbstractAcsTask { @Override public String createTask(JSONObject form) { Assert.notNull(form, "请求参数不能为空"); - String task_type = form.getString("task_type"); - if (StrUtil.isBlank(task_type)) { + String taskType = form.getString("task_type"); + if (StrUtil.isBlank(taskType)) { throw new BadRequestException("业务类型不能为空"); } - String vehicle_code = form.getString("vehicle_code"); - if (StrUtil.isBlank(vehicle_code)) { + String vehicleCode = form.getString("vehicle_code"); + if (StrUtil.isBlank(vehicleCode)) { throw new BadRequestException("载具号不能为空"); } - String point_code1 = form.getString("point_code1"); - if (StrUtil.isBlank(point_code1)) { + String pointCode1 = form.getString("point_code1"); + if (StrUtil.isBlank(pointCode1)) { throw new BadRequestException("起点不能为空"); } - String point_code2 = form.getString("point_code2"); - if (StrUtil.isBlank(point_code2)) { + String pointCode2 = form.getString("point_code2"); + if (StrUtil.isBlank(pointCode2)) { throw new BadRequestException("下一点不能为空"); } - JSONObject json = new JSONObject(); - String point_code3 = form.getString("point_code3"); - String point_code4 = form.getString("point_code4"); - json.put("vehicle_code", form.getString("vehicle_code")); - json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); - json.put("task_code", IdUtil.getSnowflake(1, 1).nextId()); - json.put("task_type", form.getString("task_type")); - json.put("priority", "1"); - json.put("point_code1", point_code1); - json.put("point_code2", point_code2); - json.put("point_code3", point_code3); - json.put("point_code4", point_code4); - json.put("handle_class", this.getClass().getName()); - json.put("create_id", SecurityUtils.getCurrentUserId()); - json.put("create_name", SecurityUtils.getCurrentUsername()); - json.put("create_time", DateUtil.now()); - json.put("task_status", StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")); + //是否立即下发 boolean isSend = !StrUtil.isNotBlank(form.getString("is_send")) || BooleanUtil.toBoolean(form.getString("is_send")); - json.put("is_send", isSend); - json.put("product_area", form.getString("product_area")); - taskService.save(json.toJavaObject(SchBaseTask.class)); + SchBaseTaskVO schBaseTaskVo = SchBaseTaskVO.builder() + .task_type(taskType) + .vehicle_code(vehicleCode) + .point_code1(pointCode1) + .point_code2(pointCode2) + .point_code3(form.getString("point_code3")) + .point_code4(form.getString("point_code4")) + .task_id(org.nl.common.utils.IdUtil.getStringId()) + .task_code(org.nl.common.utils.IdUtil.getStringId()) + .handle_class(this.getClass().getName()) + .create_id(SecurityUtils.getCurrentUserId()) + .create_name(SecurityUtils.getCurrentUsername()) + .create_time(DateUtil.now()) + .is_send(isSend ? "1" : "0") + .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type")) + .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")) + .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "A1" : form.getString("product_area")) + .build(); + SchBaseTask task = new SchBaseTask(); + BeanUtils.copyProperties(schBaseTaskVo, task); + taskService.save(task); //如果目标点位没有空位先创建不下发 if (isSend) { - this.immediateNotifyAcs(json.getString("task_id")); + this.immediateNotifyAcs(null); } - return json.getString("task_id"); + return task.getTask_id().toString(); } @Override - public void forceFinish(String task_id) { + public void forceFinish(String taskId) { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(task_id), SchBaseTask::getTask_id, task_id), false); + .eq(SchBaseTask::getTask_id, taskId), false); if (schBaseTask == null) { throw new BadRequestException("待检区或管制区 -> 空载具缓存位强制完成接口任务号为空！"); } schBaseTask.setTask_status(TaskStatusEnum.FINISHED.getCode()); - schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } @Override - public void cancel(String task_id) { + public void cancel(String taskId) { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(task_id), SchBaseTask::getTask_id, task_id), false); + .eq(SchBaseTask::getTask_id, taskId), false); if (schBaseTask == null) { throw new BadRequestException("待检区或管制区 -> 空载具缓存位取消接口任务号为空！"); } schBaseTask.setTask_status(IOSEnum.ACS_RESULT.code("取消")); schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java index ec911a5de..26e849eb4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java @@ -1,9 +1,7 @@ package org.nl.b_lms.sch.tasks.first_floor_area; - import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.BooleanUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -12,27 +10,24 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.nl.b_lms.pdm.productionplan.dao.PdmBiSlittingproductionplan; -import org.nl.b_lms.pdm.productionplan.service.IpdmBiSlittingproductionplanService; +import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService; +import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; +import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; -import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdis; -import org.nl.b_lms.storage_manage.ios.service.iostorInv.impl.StIvtIostorinvdisServiceImpl; import org.nl.common.enums.ContainerLevelEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; @@ -54,10 +49,12 @@ import java.util.stream.Stream; public class MzhcwTask extends AbstractAcsTask { private final String THIS_CLASS = MzhcwTask.class.getName(); + @Resource private IschBaseTaskService taskService; + @Resource - private IpdmBiSlittingproductionplanService productionPlanService; + private IPdmBiSlittingproductionplanService productionPlanService; @Resource private IbstIvtPackageinfoivtService packageinfoivtService; @@ -75,6 +72,7 @@ public class MzhcwTask extends AbstractAcsTask { private SsxDjwTask ssxDjwTask; + @Override public List addTask() { ArrayList resultList = new ArrayList<>(); @@ -108,9 +106,7 @@ public class MzhcwTask extends AbstractAcsTask { @Override @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject taskObj, String status) { - SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(taskObj.getString("task_code")), SchBaseTask::getTask_code, taskObj.getString("task_code")), false); - ; + SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper().eq(StringUtils.isNotBlank(taskObj.getString("task_id")), SchBaseTask::getTask_id, taskObj.getString("task_id")), false); if (schBaseTask == null) { throw new BadRequestException("输送线点位 -> 满轴缓存位更新接口任务号为空！"); } @@ -127,7 +123,7 @@ public class MzhcwTask extends AbstractAcsTask { packageinfoivtService.update(new UpdateWrapper().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1())); //更新库存记录 packageinfoivtService.update(new UpdateWrapper().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("有子卷")).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2())); - //3.查询子卷信息，去分切计划表查找定级数据，桁架任务完成根据子卷定级创建AGV任务将满轴搬运至质检区或管制区 + //3.任务一、待检区AGV搬运任务，查询子卷信息，去分切计划表查找定级数据，桁架任务完成根据子卷定级创建AGV任务将满轴搬运至质检区或管制区 if (StringUtils.isBlank(schBaseTask.getVehicle_code())) { throw new BadRequestException("子卷号不能为空!"); } @@ -178,6 +174,7 @@ public class MzhcwTask extends AbstractAcsTask { .filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位").equals(r.getPoint_status()) && PackageInfoIvtEnum.IVT_STATUS.code("空载具").equals(r.getIvt_status())).collect(Collectors.toList()); JSONObject toSsxTask = new JSONObject(); + toSsxTask.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务")); toSsxTask.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)")); toSsxTask.put("vehicle_code", containerInfo.getContainer_name()); //判断空载具缓存位是否有空载具库存,有就叫agv去任一一个位置搬空载具 @@ -250,75 +247,76 @@ public class MzhcwTask extends AbstractAcsTask { @Override public String createTask(JSONObject form) { Assert.notNull(form, "请求参数不能为空"); - String task_type = form.getString("task_type"); - if (StrUtil.isBlank(task_type)) { + String taskType = form.getString("task_type"); + if (StrUtil.isBlank(taskType)) { throw new BadRequestException("业务类型不能为空"); } - String vehicle_code = form.getString("vehicle_code"); - if (StrUtil.isBlank(vehicle_code)) { + String vehicleCode = form.getString("vehicle_code"); + if (StrUtil.isBlank(vehicleCode)) { throw new BadRequestException("载具号不能为空"); } - String point_code1 = form.getString("point_code1"); - if (StrUtil.isBlank(point_code1)) { + String pointCode1 = form.getString("point_code1"); + if (StrUtil.isBlank(pointCode1)) { throw new BadRequestException("起点不能为空"); } - String point_code2 = form.getString("point_code2"); - if (StrUtil.isBlank(point_code2)) { + String pointCode2 = form.getString("point_code2"); + if (StrUtil.isBlank(pointCode2)) { throw new BadRequestException("下一点不能为空"); } - JSONObject json = new JSONObject(); - String point_code3 = form.getString("point_code3"); - String point_code4 = form.getString("point_code4"); - json.put("vehicle_code", form.getString("vehicle_code")); - json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); - json.put("task_code", IdUtil.getSnowflake(1, 1).nextId()); - json.put("task_type", form.getString("task_type")); - json.put("priority", "1"); - json.put("point_code1", point_code1); - json.put("point_code2", point_code2); - json.put("point_code3", point_code3); - json.put("point_code4", point_code4); - json.put("handle_class", this.getClass().getName()); - json.put("create_id", SecurityUtils.getCurrentUserId()); - json.put("create_name", SecurityUtils.getCurrentUsername()); - json.put("create_time", DateUtil.now()); - json.put("task_status", StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")); + //是否立即下发 boolean isSend = !StrUtil.isNotBlank(form.getString("is_send")) || BooleanUtil.toBoolean(form.getString("is_send")); - json.put("is_send", isSend); - json.put("product_area", form.getString("product_area")); - taskService.save(json.toJavaObject(SchBaseTask.class)); + SchBaseTaskVO schBaseTaskVo = SchBaseTaskVO.builder() + .task_type(taskType) + .vehicle_code(vehicleCode) + .point_code1(pointCode1) + .point_code2(pointCode2) + .point_code3(form.getString("point_code3")) + .point_code4(form.getString("point_code4")) + .task_id(org.nl.common.utils.IdUtil.getStringId()) + .task_code(org.nl.common.utils.IdUtil.getStringId()) + .handle_class(this.getClass().getName()) + .create_id(SecurityUtils.getCurrentUserId()) + .create_name(SecurityUtils.getCurrentUsername()) + .create_time(DateUtil.now()) + .is_send(isSend ? "1" : "0") + .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type")) + .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")) + .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "A1" : form.getString("product_area")) + .build(); + SchBaseTask task = new SchBaseTask(); + BeanUtils.copyProperties(schBaseTaskVo, task); + taskService.save(task); //如果目标点位没有空位先创建不下发 if (isSend) { - this.immediateNotifyAcs(json.getString("task_id")); + this.immediateNotifyAcs(null); } - return json.getString("task_id"); + return task.getTask_id().toString(); } @Override - public void forceFinish(String task_id) { + public void forceFinish(String taskId) { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(task_id), SchBaseTask::getTask_id, task_id), false); + .eq(SchBaseTask::getTask_id, taskId), false); if (schBaseTask == null) { throw new BadRequestException("输送线点位 -> 满轴缓存位强制完成接口任务号为空！"); } schBaseTask.setTask_status(TaskStatusEnum.FINISHED.getCode()); - schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } @Override - public void cancel(String task_id) { + public void cancel(String taskId) { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(task_id), SchBaseTask::getTask_id, task_id), false); + .eq(SchBaseTask::getTask_id, taskId), false); if (schBaseTask == null) { throw new BadRequestException("输送线点位 -> 满轴缓存位取消接口任务号为空！"); } schBaseTask.setTask_status(IOSEnum.ACS_RESULT.code("取消")); schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java index b205cc6c9..a8bc849b4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java @@ -2,7 +2,6 @@ package org.nl.b_lms.sch.tasks.first_floor_area; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.BooleanUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -14,6 +13,7 @@ import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; +import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; @@ -22,9 +22,9 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -87,7 +87,7 @@ public class SsxDjwTask extends AbstractAcsTask { @Override @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject taskObj, String status) { - SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper().eq(StringUtils.isNotBlank(taskObj.getString("task_code1")), SchBaseTask::getTask_code, taskObj.getString("task_code1")), false); + SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper().eq(StringUtils.isNotBlank(taskObj.getString("task_id")), SchBaseTask::getTask_id, taskObj.getString("task_id")), false); if (schBaseTask == null) { throw new BadRequestException("空载具缓存位 -> 输送线更新接口任务号为空！"); } @@ -137,75 +137,76 @@ public class SsxDjwTask extends AbstractAcsTask { @Override public String createTask(JSONObject form) { Assert.notNull(form, "请求参数不能为空"); - String task_type = form.getString("task_type"); - if (StrUtil.isBlank(task_type)) { + String taskType = form.getString("task_type"); + if (StrUtil.isBlank(taskType)) { throw new BadRequestException("业务类型不能为空"); } - String vehicle_code = form.getString("vehicle_code"); - if (StrUtil.isBlank(vehicle_code)) { + String vehicleCode = form.getString("vehicle_code"); + if (StrUtil.isBlank(vehicleCode)) { throw new BadRequestException("载具号不能为空"); } - String point_code1 = form.getString("point_code1"); - if (StrUtil.isBlank(point_code1)) { + String pointCode1 = form.getString("point_code1"); + if (StrUtil.isBlank(pointCode1)) { throw new BadRequestException("起点不能为空"); } - String point_code2 = form.getString("point_code2"); - if (StrUtil.isBlank(point_code2)) { + String pointCode2 = form.getString("point_code2"); + if (StrUtil.isBlank(pointCode2)) { throw new BadRequestException("下一点不能为空"); } - JSONObject json = new JSONObject(); - String point_code3 = form.getString("point_code3"); - String point_code4 = form.getString("point_code4"); - json.put("vehicle_code", form.getString("vehicle_code")); - json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); - json.put("task_code", IdUtil.getSnowflake(1, 1).nextId()); - json.put("task_type", form.getString("task_type")); - json.put("priority", "1"); - json.put("point_code1", point_code1); - json.put("point_code2", point_code2); - json.put("point_code3", point_code3); - json.put("point_code4", point_code4); - json.put("handle_class", this.getClass().getName()); - json.put("create_id", SecurityUtils.getCurrentUserId()); - json.put("create_name", SecurityUtils.getCurrentUsername()); - json.put("create_time", DateUtil.now()); - json.put("task_status", StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")); + //是否立即下发 boolean isSend = !StrUtil.isNotBlank(form.getString("is_send")) || BooleanUtil.toBoolean(form.getString("is_send")); - json.put("is_send", isSend); - json.put("product_area", form.getString("product_area")); - taskService.save(json.toJavaObject(SchBaseTask.class)); + SchBaseTaskVO schBaseTaskVo = SchBaseTaskVO.builder() + .task_type(taskType) + .vehicle_code(vehicleCode) + .point_code1(pointCode1) + .point_code2(pointCode2) + .point_code3(form.getString("point_code3")) + .point_code4(form.getString("point_code4")) + .task_id(org.nl.common.utils.IdUtil.getStringId()) + .task_code(org.nl.common.utils.IdUtil.getStringId()) + .handle_class(this.getClass().getName()) + .create_id(SecurityUtils.getCurrentUserId()) + .create_name(SecurityUtils.getCurrentUsername()) + .create_time(DateUtil.now()) + .is_send(isSend ? "1" : "0") + .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type")) + .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")) + .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "A1" : form.getString("product_area")) + .build(); + SchBaseTask task = new SchBaseTask(); + BeanUtils.copyProperties(schBaseTaskVo, task); + taskService.save(task); //如果目标点位没有空位先创建不下发 if (isSend) { - this.immediateNotifyAcs(json.getString("task_id")); + this.immediateNotifyAcs(null); } - return json.getString("task_id"); + return task.getTask_id().toString(); } @Override - public void forceFinish(String task_id) { + public void forceFinish(String taskId) { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(task_id), SchBaseTask::getTask_id, task_id), false) ; + .eq(SchBaseTask::getTask_id, taskId), false) ; if (schBaseTask == null) { throw new BadRequestException("空载具缓存位 -> 输送线强制完成接口任务号为空！"); } schBaseTask.setTask_status(TaskStatusEnum.FINISHED.getCode()); - schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } @Override - public void cancel(String task_id) { + public void cancel(String taskId) { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(task_id), SchBaseTask::getTask_id, task_id), false) ; + .eq(SchBaseTask::getTask_id, taskId), false) ; if (schBaseTask == null) { throw new BadRequestException("空载具缓存位 -> 输送线取消接口任务号为空！"); } schBaseTask.setTask_status(IOSEnum.ACS_RESULT.code("取消")); schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java index 67c9313d3..b6e3ef745 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java @@ -3,7 +3,6 @@ package org.nl.b_lms.sch.tasks.first_floor_area; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.BooleanUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -14,6 +13,7 @@ import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; +import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.OutBoxManageService; @@ -23,9 +23,9 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -81,9 +81,7 @@ public class ZxDjwTask extends AbstractAcsTask { @Override @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject taskObj, String status) { - SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(taskObj.getString("task_code")), SchBaseTask::getTask_code, taskObj.getString("task_code")), false); - ; + SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper().eq(StringUtils.isNotBlank(taskObj.getString("task_id")), SchBaseTask::getTask_id, taskObj.getString("task_id")), false); if (schBaseTask == null) { throw new BadRequestException("满轴缓存位 -> 管制区更新接口任务号为空！"); } @@ -121,76 +119,77 @@ public class ZxDjwTask extends AbstractAcsTask { @Override public String createTask(JSONObject form) { Assert.notNull(form, "请求参数不能为空"); - String task_type = form.getString("task_type"); - if (StrUtil.isBlank(task_type)) { + String taskType = form.getString("task_type"); + if (StrUtil.isBlank(taskType)) { throw new BadRequestException("业务类型不能为空"); } - String vehicle_code = form.getString("vehicle_code"); - if (StrUtil.isBlank(vehicle_code)) { + String vehicleCode = form.getString("vehicle_code"); + if (StrUtil.isBlank(vehicleCode)) { throw new BadRequestException("载具号不能为空"); } - String point_code1 = form.getString("point_code1"); - if (StrUtil.isBlank(point_code1)) { + String pointCode1 = form.getString("point_code1"); + if (StrUtil.isBlank(pointCode1)) { throw new BadRequestException("起点不能为空"); } - String point_code2 = form.getString("point_code2"); - if (StrUtil.isBlank(point_code2)) { + String pointCode2 = form.getString("point_code2"); + if (StrUtil.isBlank(pointCode2)) { throw new BadRequestException("下一点不能为空"); } - JSONObject json = new JSONObject(); - String point_code3 = form.getString("point_code3"); - String point_code4 = form.getString("point_code4"); - json.put("vehicle_code", form.getString("vehicle_code")); - json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); - json.put("task_code", IdUtil.getSnowflake(1, 1).nextId()); - json.put("task_type", form.getString("task_type")); - json.put("priority", "1"); - json.put("point_code1", point_code1); - json.put("point_code2", point_code2); - json.put("point_code3", point_code3); - json.put("point_code4", point_code4); - json.put("handle_class", this.getClass().getName()); - json.put("create_id", SecurityUtils.getCurrentUserId()); - json.put("create_name", SecurityUtils.getCurrentUsername()); - json.put("create_time", DateUtil.now()); - json.put("task_status", StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")); + //是否立即下发 boolean isSend = !StrUtil.isNotBlank(form.getString("is_send")) || BooleanUtil.toBoolean(form.getString("is_send")); - json.put("is_send", isSend); - json.put("product_area", form.getString("product_area")); - taskService.save(json.toJavaObject(SchBaseTask.class)); + SchBaseTaskVO schBaseTaskVo = SchBaseTaskVO.builder() + .task_type(taskType) + .vehicle_code(vehicleCode) + .point_code1(pointCode1) + .point_code2(pointCode2) + .point_code3(form.getString("point_code3")) + .point_code4(form.getString("point_code4")) + .task_id(org.nl.common.utils.IdUtil.getStringId()) + .task_code(org.nl.common.utils.IdUtil.getStringId()) + .handle_class(this.getClass().getName()) + .create_id(SecurityUtils.getCurrentUserId()) + .create_name(SecurityUtils.getCurrentUsername()) + .create_time(DateUtil.now()) + .is_send(isSend ? "1" : "0") + .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type")) + .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")) + .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "A1" : form.getString("product_area")) + .build(); + SchBaseTask task = new SchBaseTask(); + BeanUtils.copyProperties(schBaseTaskVo, task); + taskService.save(task); //如果目标点位没有空位先创建不下发 if (isSend) { - this.immediateNotifyAcs(json.getString("task_id")); + this.immediateNotifyAcs(null); } - return json.getString("task_id"); + return task.getTask_id().toString(); } @Override - public void forceFinish(String task_id) { + public void forceFinish(String taskId) { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(task_id), SchBaseTask::getTask_id, task_id), false); + .eq(SchBaseTask::getTask_id, taskId), false); if (schBaseTask == null) { throw new BadRequestException("装箱区 -> 装箱对接位强制完成接口任务号为空！"); } schBaseTask.setTask_status(TaskStatusEnum.FINISHED.getCode()); - schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } @Override - public void cancel(String task_id) { + public void cancel(String taskId) { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(task_id), SchBaseTask::getTask_id, task_id), false); + .eq(SchBaseTask::getTask_id, taskId), false); if (schBaseTask == null) { throw new BadRequestException("装箱区 -> 装箱对接位取消接口任务号为空！"); } schBaseTask.setTask_status(IOSEnum.ACS_RESULT.code("取消")); schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java index 54f5ecca3..e28b8608d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java @@ -3,7 +3,6 @@ package org.nl.b_lms.sch.tasks.first_floor_area; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.BooleanUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -16,6 +15,7 @@ import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationServi import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; +import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; @@ -24,9 +24,9 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -88,9 +88,7 @@ public class ZxqTask extends AbstractAcsTask { @Override @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject taskObj, String status) { - SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(taskObj.getString("task_code")), SchBaseTask::getTask_code, taskObj.getString("task_code")), false); - ; + SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper().eq(StringUtils.isNotBlank(taskObj.getString("task_id")), SchBaseTask::getTask_id, taskObj.getString("task_id")), false); if (schBaseTask == null) { throw new BadRequestException("待检区 -> 装箱区更新接口任务号为空！"); } @@ -119,6 +117,7 @@ public class ZxqTask extends AbstractAcsTask { //创建搬运任务到装箱位 JSONObject jo = new JSONObject(); jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("装箱区->装箱对接位")); + jo.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务")); jo.put("point_code1", schBaseTask.getPoint_code2()); jo.put("point_code2", zxdjwPoint.getPoint_code()); jo.put("vehicle_code", schBaseTask.getVehicle_code()); @@ -135,7 +134,7 @@ public class ZxqTask extends AbstractAcsTask { schBaseTask.setIs_delete(IOSEnum.IS_NOTANDYES.code("是")); } schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); @@ -144,76 +143,76 @@ public class ZxqTask extends AbstractAcsTask { @Override public String createTask(JSONObject form) { Assert.notNull(form, "请求参数不能为空"); - String task_type = form.getString("task_type"); - if (StrUtil.isBlank(task_type)) { + String taskType = form.getString("task_type"); + if (StrUtil.isBlank(taskType)) { throw new BadRequestException("业务类型不能为空"); } - String vehicle_code = form.getString("vehicle_code"); - if (StrUtil.isBlank(vehicle_code)) { + String vehicleCode = form.getString("vehicle_code"); + if (StrUtil.isBlank(vehicleCode)) { throw new BadRequestException("载具号不能为空"); } - String point_code1 = form.getString("point_code1"); - if (StrUtil.isBlank(point_code1)) { + String pointCode1 = form.getString("point_code1"); + if (StrUtil.isBlank(pointCode1)) { throw new BadRequestException("起点不能为空"); } - String point_code2 = form.getString("point_code2"); - if (StrUtil.isBlank(point_code2)) { + String pointCode2 = form.getString("point_code2"); + if (StrUtil.isBlank(pointCode2)) { throw new BadRequestException("下一点不能为空"); } - JSONObject json = new JSONObject(); - String point_code3 = form.getString("point_code3"); - String point_code4 = form.getString("point_code4"); - json.put("vehicle_code", form.getString("vehicle_code")); - json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); - json.put("task_code", IdUtil.getSnowflake(1, 1).nextId()); - json.put("task_type", form.getString("task_type")); - json.put("priority", "1"); - json.put("point_code1", point_code1); - json.put("point_code2", point_code2); - json.put("point_code3", point_code3); - json.put("point_code4", point_code4); - json.put("handle_class", this.getClass().getName()); - json.put("create_id", SecurityUtils.getCurrentUserId()); - json.put("create_name", SecurityUtils.getCurrentUsername()); - json.put("create_time", DateUtil.now()); - json.put("task_status", StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")); + //是否立即下发 boolean isSend = !StrUtil.isNotBlank(form.getString("is_send")) || BooleanUtil.toBoolean(form.getString("is_send")); - json.put("is_send", isSend); - json.put("product_area", form.getString("product_area")); - taskService.save(json.toJavaObject(SchBaseTask.class)); + SchBaseTaskVO schBaseTaskVo = SchBaseTaskVO.builder() + .task_type(taskType) + .vehicle_code(vehicleCode) + .point_code1(pointCode1) + .point_code2(pointCode2) + .point_code3(form.getString("point_code3")) + .point_code4(form.getString("point_code4")) + .task_id(org.nl.common.utils.IdUtil.getStringId()) + .task_code(org.nl.common.utils.IdUtil.getStringId()) + .handle_class(this.getClass().getName()) + .create_id(SecurityUtils.getCurrentUserId()) + .create_name(SecurityUtils.getCurrentUsername()) + .create_time(DateUtil.now()) + .is_send(isSend ? "1" : "0") + .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type")) + .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")) + .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "A1" : form.getString("product_area")) + .build(); + SchBaseTask task = new SchBaseTask(); + BeanUtils.copyProperties(schBaseTaskVo, task); + taskService.save(task); //如果目标点位没有空位先创建不下发 if (isSend) { - this.immediateNotifyAcs(json.getString("task_id")); + this.immediateNotifyAcs(null); } - return json.getString("task_id"); + return task.getTask_id().toString(); } - @Override - public void forceFinish(String task_id) { + public void forceFinish(String taskId) { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(task_id), SchBaseTask::getTask_id, task_id), false); + .eq(SchBaseTask::getTask_id, taskId), false); if (schBaseTask == null) { throw new BadRequestException("待检区 -> 装箱区强制完成接口任务号为空！"); } schBaseTask.setTask_status(TaskStatusEnum.FINISHED.getCode()); - schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } @Override - public void cancel(String task_id) { + public void cancel(String taskId) { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() - .eq(StringUtils.isNotBlank(task_id), SchBaseTask::getTask_id, task_id), false); + .eq(SchBaseTask::getTask_id, taskId), false); if (schBaseTask == null) { throw new BadRequestException("待检区 -> 装箱区取消接口任务号为空！"); } schBaseTask.setTask_status(IOSEnum.ACS_RESULT.code("取消")); schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId()); schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName()); taskService.update(schBaseTask); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java index dce2e0ded..053e04f82 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java @@ -16,7 +16,6 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.pda.mps.eum.RegionTypeEnum; import org.nl.wms.sch.tasks.CutConveyorTask; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/lms/nladmin-system/src/main/java/org/nl/common/domain/query/BaseQuery.java b/lms/nladmin-system/src/main/java/org/nl/common/domain/query/BaseQuery.java index 72a517abb..42cb8cad3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/common/domain/query/BaseQuery.java +++ b/lms/nladmin-system/src/main/java/org/nl/common/domain/query/BaseQuery.java @@ -28,7 +28,7 @@ public class BaseQuery { /** * 是否启用 */ - private Boolean is_used; + private String is_used; /** * 创建时间范围查询 */ diff --git a/lms/nladmin-system/src/main/java/org/nl/common/enums/PackageInfoIvtEnum.java b/lms/nladmin-system/src/main/java/org/nl/common/enums/PackageInfoIvtEnum.java index 1a0bc88ff..a58275c5b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/common/enums/PackageInfoIvtEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/common/enums/PackageInfoIvtEnum.java @@ -40,7 +40,7 @@ public enum PackageInfoIvtEnum { POINT_LOCATION(MapOf.of("上", "0", "下", "1")), //库存状态 - IVT_STATUS(MapOf.of("空", "0", "1", "空载具", "2", "有子卷")); + IVT_STATUS(MapOf.of("空", "0","空载具", "1","有子卷","2")); private Map code; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 09c5c87aa..7c40ff9d9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -1,6 +1,4 @@ package org.nl.wms.ext.acs.service.impl; - -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; @@ -18,7 +16,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; -import org.nl.b_lms.sch.point.service.IschBasePointService; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.sch.tasks.TwoBoxExcepTask; @@ -115,8 +112,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Resource private IschBaseTaskService taskService; - @Resource - private IschBasePointService pointService; + @Resource private IbstIvtPackageinfoivtService packageinfoivtService; @@ -170,8 +166,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } // 任务处理类 try { - Class clz = Class.forName(processing_class); - Object obj = clz.newInstance(); + Object obj = SpringContextHolder.getBean(Class.forName(processing_class)); // 调用每个任务类的forceFinishInst()强制结束方法 Method m = obj.getClass().getDeclaredMethod("updateTaskStatus", JSONObject.class, String.class); m.invoke(obj, row, status); @@ -1679,9 +1674,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public void initPoint() { WQLObject point = WQLObject.getWQLObject("sch_base_point"); - JSONArray resultJSONArray = point.query("point_type = '9' order by point_code").getResultJSONArray(0); - for (int i = 0; i < resultJSONArray.size(); i++) { JSONObject json = resultJSONArray.getJSONObject(i); json.put("device_code", json.getString("point_code")); @@ -1787,7 +1780,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { mzhcwTask.createTask(jo); } result.put("status", HttpStatus.OK.value()); - result.put("message", "反馈成功!"); + result.put("message", "操作成功!"); return result; } } @@ -1842,10 +1835,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (ObjectUtil.isEmpty(whereJson.getString("container_type"))) { throw new BadRequestException("载具类型不能为空!"); } - whereJson.put("vehicle_type", whereJson.getString("container_type")); outVehicleManageService.outVehicle(whereJson); - } else if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("异常处理位"))) { // 4-空木箱异常处理 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java index 0c80dc448..1949929ff 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java @@ -32,11 +32,9 @@ public class AcsUtil { result.put("data", new JSONObject()); return result; } - for (int j = 0; j < list.size(); j++) { JSONObject jo = list.getJSONObject(j); String product_area = jo.getString("product_area"); - if (jo.containsKey("class_type") && jo.getString("class_type").contains("0105")) { product_area = "LK"; } @@ -46,13 +44,12 @@ public class AcsUtil { if (StrUtil.isEmpty(product_area)) { throw new BadRequestException("区域不能为空!下发信息：" + jo.toString()); } - - String acs_url = URLEnum.find(product_area); + //String acs_url = URLEnum.find(product_area); + String acs_url = "http://192.168.81.65:8011/"; if (StrUtil.isEmpty(acs_url)) { log.info(product_area); throw new BadRequestException("未查询到区域对应的acs地址！"); } - String url = acs_url + api; try { JSONArray rows = new JSONArray(); @@ -62,7 +59,6 @@ public class AcsUtil { .execute().body(); result = JSONObject.parseObject(resultMsg); log.info("ACS相应参数----------------------------------------+" + api + ",---" + result.toString()); - } catch (Exception e) { String msg = e.getMessage(); //ConnectException: Connection refused: connect @@ -88,7 +84,6 @@ public class AcsUtil { } } - return result; } @@ -151,8 +146,6 @@ public class AcsUtil { } } } - - return result; } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java index b1a25052c..4067a94d0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java @@ -114,7 +114,6 @@ public abstract class AbstractAcsTask { return AcsUtil.notifyAcs("api/wms/task", arr); } return null; - } /** diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/URLEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/URLEnum.java index a8ccf9f2b..c6d90c495 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/URLEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/URLEnum.java @@ -10,6 +10,7 @@ import java.util.function.Supplier; @Getter @AllArgsConstructor public enum URLEnum { + // ACS_URL_A1("A1", () -> SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("ACS_URL_A1").getValue()), ACS_URL_A2("A2", () -> SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("ACS_URL_A2").getValue()), ACS_URL_A3("A3", () -> SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("ACS_URL_A3").getValue()),