From d03c915e927bb93e9f71e2e0ee99b65a5050f7a6 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Thu, 9 May 2024 20:01:54 +0800 Subject: [PATCH] =?UTF-8?q?dev:=E6=96=B0=E5=A2=9E=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E5=8C=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tray/controller/PdmBiTrayController.java | 60 ++++++++++ .../tray/controller/TrayplanController.java | 59 ++++++++++ .../pdm/tray/service/IPdmBiTrayService.java | 43 +++++++ .../pdm/tray/service/ITrayplanService.java | 43 +++++++ .../b_lms/pdm/tray/service/dao/PdmBiTray.java | 48 ++++++++ .../b_lms/pdm/tray/service/dao/Trayplan.java | 46 ++++++++ .../service/dao/mapper/PdmBiTrayMapper.java | 12 ++ .../service/dao/mapper/PdmBiTrayMapper.xml | 5 + .../service/dao/mapper/TrayplanMapper.java | 12 ++ .../service/dao/mapper/TrayplanMapper.xml | 5 + .../pdm/tray/service/dto/PdmBiTrayDto.java | 50 ++++++++ .../pdm/tray/service/dto/PdmBiTrayQuery.java | 12 ++ .../pdm/tray/service/dto/TrayplanDto.java | 61 ++++++++++ .../pdm/tray/service/dto/TrayplanQuery.java | 12 ++ .../service/impl/PdmBiTrayServiceImpl.java | 66 +++++++++++ .../service/impl/TrayplanServiceImpl.java | 67 +++++++++++ .../mps/service/impl/BakingServiceImpl.java | 28 ++--- lms/nladmin-ui/src/views/b_lms/pdm/index.vue | 100 ++++++++++++++++ .../views/b_lms/pdm/ivt/trayplan/index.vue | 110 ++++++++++++++++++ .../views/b_lms/pdm/ivt/trayplan/trayplan.js | 27 +++++ .../src/views/b_lms/pdm/pdmBiTray.js | 27 +++++ 21 files changed, 880 insertions(+), 13 deletions(-) create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/controller/PdmBiTrayController.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/controller/TrayplanController.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/IPdmBiTrayService.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/ITrayplanService.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/PdmBiTray.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/Trayplan.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/mapper/PdmBiTrayMapper.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/mapper/PdmBiTrayMapper.xml create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/mapper/TrayplanMapper.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/mapper/TrayplanMapper.xml create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dto/PdmBiTrayDto.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dto/PdmBiTrayQuery.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dto/TrayplanDto.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dto/TrayplanQuery.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/impl/PdmBiTrayServiceImpl.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/impl/TrayplanServiceImpl.java create mode 100644 lms/nladmin-ui/src/views/b_lms/pdm/index.vue create mode 100644 lms/nladmin-ui/src/views/b_lms/pdm/ivt/trayplan/index.vue create mode 100644 lms/nladmin-ui/src/views/b_lms/pdm/ivt/trayplan/trayplan.js create mode 100644 lms/nladmin-ui/src/views/b_lms/pdm/pdmBiTray.js diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/controller/PdmBiTrayController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/controller/PdmBiTrayController.java new file mode 100644 index 000000000..03d727548 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/controller/PdmBiTrayController.java @@ -0,0 +1,60 @@ +package org.nl.b_lms.pdm.tray.controller; + +import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.pdm.tray.service.IPdmBiTrayService; +import org.nl.b_lms.pdm.tray.service.dao.PdmBiTray; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.modules.logging.annotation.Log; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.Set; + +/** + * @author zhouz + * @date 2024-04-29 + **/ +@Slf4j +@RestController +@RequestMapping("/api/pdmBiTray") +public class PdmBiTrayController { + + @Autowired + private IPdmBiTrayService pdmBiTrayService; + + @GetMapping + @Log("查询Tray") + //@SaCheckPermission("@el.check('pdmBiTray:list')") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(pdmBiTrayService.queryAll(whereJson, page)), HttpStatus.OK); + } + + @PostMapping + @Log("新增Tray") + //@SaCheckPermission("@el.check('pdmBiTray:add')") + public ResponseEntity create(@Validated @RequestBody PdmBiTray entity) { + pdmBiTrayService.create(entity); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改Tray") + //@SaCheckPermission("@el.check('pdmBiTray:edit')") + public ResponseEntity update(@Validated @RequestBody PdmBiTray entity) { + pdmBiTrayService.update(entity); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除Tray") + //@SaCheckPermission("@el.check('pdmBiTray:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody Set ids) { + pdmBiTrayService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/controller/TrayplanController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/controller/TrayplanController.java new file mode 100644 index 000000000..1b5cd092f --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/controller/TrayplanController.java @@ -0,0 +1,59 @@ +package org.nl.b_lms.pdm.tray.controller; + +import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.pdm.tray.service.ITrayplanService; +import org.nl.b_lms.pdm.tray.service.dao.Trayplan; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.modules.logging.annotation.Log; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.Set; +/** +* @author zhouz +* @date 2024-04-29 +**/ +@Slf4j +@RestController +@RequestMapping("/api/trayplan") +public class TrayplanController { + + @Autowired + private ITrayplanService trayplanService; + + @GetMapping + @Log("查询TrayPlan") + //@SaCheckPermission("@el.check('trayplan:list')") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(trayplanService.queryAll(whereJson,page)),HttpStatus.OK); + } + + @PostMapping + @Log("新增TrayPlan") + //@SaCheckPermission("@el.check('trayplan:add')") + public ResponseEntity create(@Validated @RequestBody Trayplan entity){ + trayplanService.create(entity); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改TrayPlan") + //@SaCheckPermission("@el.check('trayplan:edit')") + public ResponseEntity update(@Validated @RequestBody Trayplan entity){ + trayplanService.update(entity); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除TrayPlan") + //@SaCheckPermission("@el.check('trayplan:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody Set ids) { + trayplanService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/IPdmBiTrayService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/IPdmBiTrayService.java new file mode 100644 index 000000000..0b5eaf160 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/IPdmBiTrayService.java @@ -0,0 +1,43 @@ +package org.nl.b_lms.pdm.tray.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.b_lms.pdm.tray.service.dao.PdmBiTray; +import org.nl.common.domain.query.PageQuery; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务接口 +* @author zhouz +* @date 2024-04-29 +**/ +public interface IPdmBiTrayService extends IService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 创建 + * @param entity / + */ + void create(PdmBiTray entity); + + /** + * 编辑 + * @param entity / + */ + void update(PdmBiTray entity); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Set ids); +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/ITrayplanService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/ITrayplanService.java new file mode 100644 index 000000000..e7c0264ce --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/ITrayplanService.java @@ -0,0 +1,43 @@ +package org.nl.b_lms.pdm.tray.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.b_lms.pdm.tray.service.dao.Trayplan; +import org.nl.common.domain.query.PageQuery; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务接口 +* @author zhouz +* @date 2024-04-29 +**/ +public interface ITrayplanService extends IService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 创建 + * @param entity / + */ + void create(Trayplan entity); + + /** + * 编辑 + * @param entity / + */ + void update(Trayplan entity); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Set ids); +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/PdmBiTray.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/PdmBiTray.java new file mode 100644 index 000000000..72fd346f0 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/PdmBiTray.java @@ -0,0 +1,48 @@ +package org.nl.b_lms.pdm.tray.service.dao; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * @author zhouz + * @description / + * @date 2024-04-29 + **/ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("PDM_BI_Tray") +public class PdmBiTray implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "ivt_id", type = IdType.NONE) + /** 标识 */ + private Long ivt_id; + + /** + * 托盘编码 + */ + private String vehicle_code; + + /** + * 排号 + */ + private String row_num; + + /** + * 物料编码 + */ + private String material_code; + + /** + * 数量 + */ + private String qty; + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/Trayplan.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/Trayplan.java new file mode 100644 index 000000000..5ddf0d2fc --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/Trayplan.java @@ -0,0 +1,46 @@ +package org.nl.b_lms.pdm.tray.service.dao; + + import com.baomidou.mybatisplus.annotation.IdType; + import com.baomidou.mybatisplus.annotation.TableId; + import com.baomidou.mybatisplus.annotation.TableName; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** +* @description / +* @author zhouz +* @date 2024-04-29 +**/ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("PDM_BI_TrayPlan") +public class Trayplan implements Serializable { + +private static final long serialVersionUID = 1L; + + @TableId(value = "plan_id", type = IdType.NONE) + /** 标识 */ + private Long plan_id; + + /** 托盘编码 */ + private String vehicle_code; + + /** 排号 */ + private String row_num; + + /** 物料编码 */ + private String material_code; + + /** 数量 */ + private Integer qty; + + /** 计划日期 */ + private String plan_date; + + /** 是否完成 */ + private String is_implemented; + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/mapper/PdmBiTrayMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/mapper/PdmBiTrayMapper.java new file mode 100644 index 000000000..846bade68 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/mapper/PdmBiTrayMapper.java @@ -0,0 +1,12 @@ +package org.nl.b_lms.pdm.tray.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.b_lms.pdm.tray.service.dao.PdmBiTray; + +/** +* @author zhouz +* @date 2024-04-29 +**/ +public interface PdmBiTrayMapper extends BaseMapper { + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/mapper/PdmBiTrayMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/mapper/PdmBiTrayMapper.xml new file mode 100644 index 000000000..2d8d57ba0 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/mapper/PdmBiTrayMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/mapper/TrayplanMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/mapper/TrayplanMapper.java new file mode 100644 index 000000000..22a45e0ec --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/mapper/TrayplanMapper.java @@ -0,0 +1,12 @@ +package org.nl.b_lms.pdm.tray.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.b_lms.pdm.tray.service.dao.Trayplan; + +/** + * @author zhouz + * @date 2024-04-29 + **/ +public interface TrayplanMapper extends BaseMapper { + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/mapper/TrayplanMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/mapper/TrayplanMapper.xml new file mode 100644 index 000000000..2b39010f1 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dao/mapper/TrayplanMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dto/PdmBiTrayDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dto/PdmBiTrayDto.java new file mode 100644 index 000000000..acca8d315 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dto/PdmBiTrayDto.java @@ -0,0 +1,50 @@ +package org.nl.b_lms.pdm.tray.service.dto; + +import lombok.Data; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import lombok.Builder; + +import java.io.Serializable; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + +/** + * @author zhouz + * @description / + * @date 2024-04-29 + **/ +@Data +@Builder +public class PdmBiTrayDto implements Serializable { + + /** 标识 */ + /** + * 防止精度丢失 + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long ivt_id; + + /** + * 托盘编码 + */ + private String vehicle_code; + + /** + * 排号 + */ + private String row_num; + + /** + * 物料编码 + */ + private String material_code; + + /** + * 数量 + */ + private String qty; +} + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dto/PdmBiTrayQuery.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dto/PdmBiTrayQuery.java new file mode 100644 index 000000000..ad93206d3 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dto/PdmBiTrayQuery.java @@ -0,0 +1,12 @@ +package org.nl.b_lms.pdm.tray.service.dto; + +import org.nl.b_lms.pdm.tray.service.dao.PdmBiTray; +import org.nl.common.domain.query.BaseQuery; + +/** +* @author zhouz +* @date 2024-04-29 +**/ +public class PdmBiTrayQuery extends BaseQuery { + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dto/TrayplanDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dto/TrayplanDto.java new file mode 100644 index 000000000..2360a7cba --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dto/TrayplanDto.java @@ -0,0 +1,61 @@ +package org.nl.b_lms.pdm.tray.service.dto; + +import lombok.Data; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import lombok.Builder; + +import java.io.Serializable; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + +/** + * @author zhouz + * @description / + * @date 2024-04-29 + **/ +@Data +@Builder +public class TrayplanDto implements Serializable { + + /** 标识 */ + /** + * 防止精度丢失 + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long plan_id; + + + /** + * 托盘编码 + */ + private String vehicle_code; + + /** + * 排号 + */ + private String row_num; + + /** + * 物料编码 + */ + private String material_code; + + /** + * 数量 + */ + private Integer qty; + + /** + * 计划日期 + */ + private String plan_date; + + /** + * 是否完成 + */ + private String is_implemented; +} + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dto/TrayplanQuery.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dto/TrayplanQuery.java new file mode 100644 index 000000000..542595fde --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/dto/TrayplanQuery.java @@ -0,0 +1,12 @@ +package org.nl.b_lms.pdm.tray.service.dto; + +import org.nl.b_lms.pdm.tray.service.dao.Trayplan; +import org.nl.common.domain.query.BaseQuery; + +/** + * @author zhouz + * @date 2024-04-29 + **/ +public class TrayplanQuery extends BaseQuery { + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/impl/PdmBiTrayServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/impl/PdmBiTrayServiceImpl.java new file mode 100644 index 000000000..512a85e52 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/impl/PdmBiTrayServiceImpl.java @@ -0,0 +1,66 @@ +package org.nl.b_lms.pdm.tray.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.pdm.tray.service.IPdmBiTrayService; +import org.nl.b_lms.pdm.tray.service.dao.PdmBiTray; +import org.nl.b_lms.pdm.tray.service.dao.mapper.PdmBiTrayMapper; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.SecurityUtils; +import org.nl.modules.common.exception.BadRequestException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务实现 +* @author zhouz +* @date 2024-04-29 +**/ +@Slf4j +@Service +public class PdmBiTrayServiceImpl extends ServiceImpl implements IPdmBiTrayService { + + @Autowired + private PdmBiTrayMapper pdmBiTrayMapper; + + @Override + public IPage queryAll(Map whereJson, PageQuery page){ + LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + pdmBiTrayMapper.selectPage(pages, lam); + return pages; + } + + @Override + public void create(PdmBiTray entity) { + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + entity.setIvt_id(IdUtil.getSnowflake(1, 1).nextId()); + pdmBiTrayMapper.insert(entity); + } + + @Override + public void update(PdmBiTray entity) { + PdmBiTray dto = pdmBiTrayMapper.selectById(entity.getIvt_id()); + if (dto == null) throw new BadRequestException("未查询到对应的记录"); + + pdmBiTrayMapper.updateById(entity); + } + + @Override + public void deleteAll(Set ids) { + // 真删除 + pdmBiTrayMapper.deleteBatchIds(ids); + } + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/impl/TrayplanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/impl/TrayplanServiceImpl.java new file mode 100644 index 000000000..de40218c2 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/tray/service/impl/TrayplanServiceImpl.java @@ -0,0 +1,67 @@ +package org.nl.b_lms.pdm.tray.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.pdm.tray.service.ITrayplanService; +import org.nl.b_lms.pdm.tray.service.dao.Trayplan; +import org.nl.b_lms.pdm.tray.service.dao.mapper.TrayplanMapper; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.SecurityUtils; +import org.nl.modules.common.exception.BadRequestException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Map; +import java.util.Set; + +/** + * @author zhouz + * @description 服务实现 + * @date 2024-04-29 + **/ +@Slf4j +@Service +public class TrayplanServiceImpl extends ServiceImpl implements ITrayplanService { + + @Autowired + private TrayplanMapper trayplanMapper; + + @Override + public IPage queryAll(Map whereJson, PageQuery page) { + LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + trayplanMapper.selectPage(pages, lam); + return pages; + } + + @Override + public void create(Trayplan entity) { + + entity.setPlan_id(IdUtil.getSnowflake(1, 1).nextId()); + trayplanMapper.insert(entity); + } + + @Override + public void update(Trayplan entity) { + Trayplan dto = trayplanMapper.selectById(entity.getPlan_id()); + if (dto == null) throw new BadRequestException("未查询到对应的记录"); + + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + trayplanMapper.updateById(entity); + } + + @Override + public void deleteAll(Set ids) { + // 真删除 + trayplanMapper.deleteBatchIds(ids); + } + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index b7b10fafa..eaf17e735 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -85,7 +85,7 @@ public class BakingServiceImpl implements BakingService { if (ObjectUtil.isEmpty(raw_jo)) { throw new BadRequestException("未查询到对应的生箔工单！"); } - if (raw_jo.getString("order_type").equals("1")){ + if (raw_jo.getString("order_type").equals("1")) { throw new BadRequestException("当前工单为标箔工单，不允许烘烤！"); } String resource_name = raw_jo.getString("resource_name"); @@ -196,8 +196,8 @@ public class BakingServiceImpl implements BakingService { } JSONObject map = new JSONObject(); map.put("flag", "1"); - if (product_area.equals("B2")){ - map.put("flag","3"); + if (product_area.equals("B2")) { + map.put("flag", "3"); } map.put("reging_id", reging_id); map.put("point_location", point_location); @@ -218,22 +218,22 @@ public class BakingServiceImpl implements BakingService { JSONObject jsonHotIvt = getJsonObject(product_area, point_code2_jo, temperature); if (ObjectUtil.isEmpty(jsonHotIvt)) { - if (product_area.equals("B2")){ + if (product_area.equals("B2")) { String cant_location1 = point_code2_jo.getString("point_location"); - String cant_location = "('"+point_code2_jo.getString("point_location")+"')"; - map.put("cant_location",cant_location); + String cant_location = "('" + point_code2_jo.getString("point_location") + "')"; + map.put("cant_location", cant_location); point_code2_jo = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0); jsonHotIvt = getJsonObject(product_area, point_code2_jo, temperature); - if (ObjectUtil.isEmpty(jsonHotIvt)){ - cant_location = "('"+cant_location1+"','"+point_code2_jo.getString("point_location")+"')"; - map.put("cant_location",cant_location); + if (ObjectUtil.isEmpty(jsonHotIvt)) { + cant_location = "('" + cant_location1 + "','" + point_code2_jo.getString("point_location") + "')"; + map.put("cant_location", cant_location); point_code2_jo = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0); jsonHotIvt = getJsonObject(product_area, point_code2_jo, temperature); - if (ObjectUtil.isEmpty(jsonHotIvt)){ + if (ObjectUtil.isEmpty(jsonHotIvt)) { throw new BadRequestException("烘烤区没有合适温度的空位！"); } } - }else { + } else { throw new BadRequestException("烘烤区没有合适温度的空位！"); } } @@ -494,11 +494,13 @@ public class BakingServiceImpl implements BakingService { JSONObject map = new JSONObject(); map.put("flag", "2"); map.put("product_area", jsonPoint.getString("product_area")); - map.put("point_location", jsonPoint.getString("point_location")); + if (!jsonPoint.getString("product_area").equals("B2")) { + map.put("point_location", jsonPoint.getString("point_location")); + } JSONObject jsonCooIvt = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0); // 如果为空 - if (ObjectUtil.isEmpty(jsonCooIvt)) { + if (ObjectUtil.isEmpty(jsonCooIvt) && !jsonPoint.getString("product_area").equals("B2")) { if (StrUtil.equals(jsonPoint.getString("point_location"), "0")) { map.put("point_location", "1"); } diff --git a/lms/nladmin-ui/src/views/b_lms/pdm/index.vue b/lms/nladmin-ui/src/views/b_lms/pdm/index.vue new file mode 100644 index 000000000..6854b9a10 --- /dev/null +++ b/lms/nladmin-ui/src/views/b_lms/pdm/index.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/b_lms/pdm/ivt/trayplan/index.vue b/lms/nladmin-ui/src/views/b_lms/pdm/ivt/trayplan/index.vue new file mode 100644 index 000000000..0d4c4da76 --- /dev/null +++ b/lms/nladmin-ui/src/views/b_lms/pdm/ivt/trayplan/index.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/b_lms/pdm/ivt/trayplan/trayplan.js b/lms/nladmin-ui/src/views/b_lms/pdm/ivt/trayplan/trayplan.js new file mode 100644 index 000000000..ea27721d2 --- /dev/null +++ b/lms/nladmin-ui/src/views/b_lms/pdm/ivt/trayplan/trayplan.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/trayplan', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/trayplan/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/trayplan', + method: 'put', + data + }) +} + +export default { add, edit, del } diff --git a/lms/nladmin-ui/src/views/b_lms/pdm/pdmBiTray.js b/lms/nladmin-ui/src/views/b_lms/pdm/pdmBiTray.js new file mode 100644 index 000000000..bf089621a --- /dev/null +++ b/lms/nladmin-ui/src/views/b_lms/pdm/pdmBiTray.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/pdmBiTray', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/pdmBiTray/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/pdmBiTray', + method: 'put', + data + }) +} + +export default { add, edit, del }