add：物料载具表

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.*;
+
+/**
+ * <p>
+ * 载具信息表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-10
+ */
+@RestController
+@RequestMapping("api/MdPbVehicleMater")
+public class MdPbVehicleMaterController {
+
+
+    @Autowired
+    private IMdPbVehicleMaterService iMdPbVehicleMaterService;
+
+
+    @GetMapping()
+    public ResponseEntity<Object> vehicleInfo(VehicleMaterQuery query, PageQuery page) {
+        return new ResponseEntity<>(TableDataInfo.build(iMdPbVehicleMaterService.page(page.build(), query.build())), HttpStatus.OK);
+    }
+
+
+}
+

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;
+
+/**
+ * <p>
+ * 载具信息表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-10
+ */
+public interface IMdPbVehicleMaterService extends IService<MdPbVehicleMater> {
+
+}

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;
+
+/**
+ * <p>
+ * 载具物料信息表
+ * </p>
+ *
+ * @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;
+
+
+}

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;
+
+/**
+ * <p>
+ * 载具物料信息表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2024-04-08
+ */
+public interface MdPbVehicleMaterMapper extends BaseMapper<MdPbVehicleMater> {
+
+}

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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.mapper.MdPbVehicleMaterMapper">
+
+</mapper>

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<MdPbVehicleMater> {
+
+    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());
+    }
+}

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;
+
+/**
+ * <p>
+ * 载具物料信息表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-04-08
+ */
+@Service
+public class MdPbVehicleMaterServiceImpl extends ServiceImpl<MdPbVehicleMaterMapper, MdPbVehicleMater> implements IMdPbVehicleMaterService {
+
+}

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;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @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<BmFormStrucDto> children;
+
+
+}

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 }