From c8439abd23abc0d747334e9d73559516ff7377ba Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 15 May 2024 19:23:53 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E7=89=A9=E6=96=99=E8=BD=BD?= =?UTF-8?q?=E5=85=B7=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MdPbVehicleMaterController.java | 42 ++++++ .../service/IMdPbVehicleMaterService.java | 19 +++ .../service/dao/MdPbVehicleMater.java | 103 ++++++++++++++ .../dao/mapper/MdPbVehicleMaterMapper.java | 16 +++ .../dao/mapper/xml/MdPbVehicleivtMapper.xml | 5 + .../service/dto/VehicleMaterQuery.java | 26 ++++ .../impl/MdPbVehicleMaterServiceImpl.java | 22 +++ .../service/dto/BmFormStrucDto.java | 127 ++++++++++++++++++ .../md_manage/vehicleMater/vehicleMater.js | 82 +++++++++++ 9 files changed, 442 insertions(+) create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/controller/MdPbVehicleMaterController.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/IMdPbVehicleMaterService.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/MdPbVehicleMater.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/mapper/MdPbVehicleMaterMapper.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dto/VehicleMaterQuery.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/BmFormStrucDto.java create mode 100644 wms_pro/qd/src/views/wms/md_manage/vehicleMater/vehicleMater.js diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/controller/MdPbVehicleMaterController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/controller/MdPbVehicleMaterController.java new file mode 100644 index 00000000..644bf48d --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/controller/MdPbVehicleMaterController.java @@ -0,0 +1,42 @@ +package org.nl.wms.base_manage.vehicle.vehicleMater.controller; + + +import com.alibaba.fastjson.JSONObject; +import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; +import org.nl.common.domain.entity.PageQuery; +import org.nl.wms.base_manage.vehicle.vehicleInfo.service.IBmVehicleInfoService; +import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dto.VehicleQuery; +import org.nl.wms.base_manage.vehicle.vehicleMater.service.IMdPbVehicleMaterService; +import org.nl.wms.base_manage.vehicle.vehicleMater.service.dto.VehicleMaterQuery; +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.*; + +/** + *

+ * 载具信息表 前端控制器 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@RestController +@RequestMapping("api/MdPbVehicleMater") +public class MdPbVehicleMaterController { + + + @Autowired + private IMdPbVehicleMaterService iMdPbVehicleMaterService; + + + @GetMapping() + public ResponseEntity vehicleInfo(VehicleMaterQuery query, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(iMdPbVehicleMaterService.page(page.build(), query.build())), HttpStatus.OK); + } + + +} + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/IMdPbVehicleMaterService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/IMdPbVehicleMaterService.java new file mode 100644 index 00000000..f69ee76b --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/IMdPbVehicleMaterService.java @@ -0,0 +1,19 @@ +package org.nl.wms.base_manage.vehicle.vehicleMater.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 载具信息表 服务类 + *

+ * + * @author generator + * @since 2023-05-10 + */ +public interface IMdPbVehicleMaterService extends IService { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/MdPbVehicleMater.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/MdPbVehicleMater.java new file mode 100644 index 00000000..0a73ebbd --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/MdPbVehicleMater.java @@ -0,0 +1,103 @@ +package org.nl.wms.base_manage.vehicle.vehicleMater.service.dao; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * 载具物料信息表 + *

+ * + * @author generator + * @since 2024-04-08 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_pb_vehicleMater") +public class MdPbVehicleMater implements Serializable { + + private static final long serialVersionUID = 1L; + + private String id; + + /** + * 载具编码 + */ + private String vehicle_code; + + /** + * 物料标识 + */ + private String material_id; + + /** + * 工序id + */ + private String workprocedure_id; + + /** + * 批次 + */ + private String pcsn; + + /** + * 数量 + */ + private BigDecimal qty; + + /** + * 冻结数 + */ + private BigDecimal frozen_qty; + + /** + * 数量计量单位标识 + */ + private String qty_unit_id; + + + /** + * 父容器 + */ + private String parent_vehicle_code; + + /** + * 是否含子容器 + */ + private Boolean has_child; + + /** + * 扩展信息 + */ + private String form_data; + + /** + * 物料关联单据id + */ + private String source_form_id; + /** + * 物料关联单据 + */ + private String source_form_type; + + /** + * 修改时间 + */ + private String update_time; + + /** + * 备注 + */ + private String remark; + + /** + * 组盘表code + */ + private String dick_code; + + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/mapper/MdPbVehicleMaterMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/mapper/MdPbVehicleMaterMapper.java new file mode 100644 index 00000000..6907593b --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/mapper/MdPbVehicleMaterMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater; + +/** + *

+ * 载具物料信息表 Mapper 接口 + *

+ * + * @author generator + * @since 2024-04-08 + */ +public interface MdPbVehicleMaterMapper extends BaseMapper { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml new file mode 100644 index 00000000..52494a18 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dto/VehicleMaterQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dto/VehicleMaterQuery.java new file mode 100644 index 00000000..34bfbefe --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dto/VehicleMaterQuery.java @@ -0,0 +1,26 @@ +package org.nl.wms.base_manage.vehicle.vehicleMater.service.dto; + +import lombok.Data; +import org.nl.common.domain.entity.BaseQuery; +import org.nl.common.domain.entity.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.BmVehicleInfo; +import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class VehicleMaterQuery extends BaseQuery { + + private String vehicle_code_begin; + private String vehicle_code_end; + private String vehicle_type; + + @Override + public void paramMapping() { + super.doP.put("vehicle_code_begin", QParam.builder().k(new String[]{"vehicle_code"}).type(QueryTEnum.GE).build()); + super.doP.put("vehicle_code_end", QParam.builder().k(new String[]{"vehicle_code"}).type(QueryTEnum.LE).build()); + } +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java new file mode 100644 index 00000000..e1f935b9 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java @@ -0,0 +1,22 @@ +package org.nl.wms.base_manage.vehicle.vehicleMater.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.base_manage.vehicle.vehicleMater.service.IMdPbVehicleMaterService; +import org.nl.wms.base_manage.vehicle.vehicleMater.service.IMdPbVehicleMaterService; +import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater; +import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.mapper.MdPbVehicleMaterMapper; +import org.springframework.stereotype.Service; + +/** + *

+ * 载具物料信息表 服务实现类 + *

+ * + * @author generator + * @since 2024-04-08 + */ +@Service +public class MdPbVehicleMaterServiceImpl extends ServiceImpl implements IMdPbVehicleMaterService { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/BmFormStrucDto.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/BmFormStrucDto.java new file mode 100644 index 00000000..409ed0b5 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/BmFormStrucDto.java @@ -0,0 +1,127 @@ +package org.nl.wms.config_manage.form_struc.service.dto; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * + *

+ * + * @author generator + * @since 2024-03-25 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName(value = "bm_form_struc", autoResultMap = true) +public class BmFormStrucDto implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId() + private String id; + + /** + * 单据类型 + */ + private String form_type; + + /** + * 单据名称 + */ + private String form_name; + + /** + * 描述 + */ + private String form_desc; + + /** + * 表单对应json字段 + */ + private String convert_json; + + /** + * 创建id + */ + private String create_time; + + /** + * 创建id + */ + private String create_id; + + /** + * 业务单据单据id + */ + private String biz_id; + + /** + * 业务单据编号 + */ + private String biz_code; + + /** + * 业务单据日期 + */ + private String biz_date; + + /** + * 业务单据状态 + */ + private String biz_status; + + /** + * 物料id + */ + private String material_id; + /** + * 载具 + */ + private String vehicle_code; + + /** + * 数量 + */ + private String qty; + + /** + * 单位id + */ + private String unit_id; + + /** + * 批次号 + */ + private String pcsn; + + /** + * 自定义表单字段存json:{"dept":"部门","empp":"员工"} + */ + @TableField(typeHandler = FastjsonTypeHandler.class) + private JSONObject form_param = new JSONObject(); + + /** + * 是否含有明细表单 + */ + private Boolean has_child; + + /** + * 关联上级表单id + */ + private String parent_id; + + private Boolean hasChildren = Boolean.FALSE; + + private List children; + + +} diff --git a/wms_pro/qd/src/views/wms/md_manage/vehicleMater/vehicleMater.js b/wms_pro/qd/src/views/wms/md_manage/vehicleMater/vehicleMater.js new file mode 100644 index 00000000..918b0f1e --- /dev/null +++ b/wms_pro/qd/src/views/wms/md_manage/vehicleMater/vehicleMater.js @@ -0,0 +1,82 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: '/api/mdGruopDick', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: '/api/mdGruopDick/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: '/api/mdGruopDick', + method: 'put', + data + }) +} +export function updategroup(data) { + return request({ + url: '/api/mdGruopDick/updategroup', + method: 'put', + data + }) +} + +export function addPersons(data) { + return request({ + url: '/api/mdGruopDick/addPersons', + method: 'post', + data + }) +} + +export function getHeader(data) { + return request({ + url: '/api/mdGruopDick/getHeader', + method: 'post', + data + }) +} + +export function getDeviceIdByUserId(data) { + return request({ + url: '/api/mdGruopDick/getDeviceIdByUserId', + method: 'post', + data + }) +} + +export function addDevices(data) { + return request({ + url: '/api/mdGruopDick/addDevices', + method: 'post', + data + }) +} + +export function deleteRow(data) { + return request({ + url: '/api/mdGruopDick/deleteRow', + method: 'delete', + data + }) +} + +export function excelImport(data) { + return request({ + url: '/api/mdGruopDick/excelImport', + method: 'post', + data + }) +} + +export default { add, edit, del, addPersons, getHeader, deleteRow, addDevices,excelImport,updategroup }