lhq/FT517-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

打印物料条码

Browse Source
This commit is contained in:
liuhanqing
2025-09-12 15:08:39 +08:00
parent cf00d0d5ff
commit db062b9b5c
9 changed files with 1028 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-admin/src/main/java/com/ruoyi/bas/BasProductCode/controller/BasProductCodeController.java
View File

@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
* 条码打印Controller * 条码打印Controller
* *
* @author gw * @author gw
* @date 2025-09-11 * @date 2025-09-12
*/ */
@RestController @RestController
@RequestMapping("/bas/BasProductCode") @RequestMapping("/bas/BasProductCode")
@@ -64,7 +64,7 @@ public class BasProductCodeController extends BaseController
*/ */
@PreAuthorize("@ss.hasPermi('bas:BasProductCode:query')") @PreAuthorize("@ss.hasPermi('bas:BasProductCode:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
return success(basProductCodeService.selectBasProductCodeById(id)); return success(basProductCodeService.selectBasProductCodeById(id));
} }
@@ -77,7 +77,6 @@ public class BasProductCodeController extends BaseController
@PostMapping @PostMapping
public AjaxResult add(@RequestBody BasProductCode basProductCode) public AjaxResult add(@RequestBody BasProductCode basProductCode)
{ {
return toAjax(basProductCodeService.insertBasProductCode(basProductCode)); return toAjax(basProductCodeService.insertBasProductCode(basProductCode));
} }
@@ -98,7 +97,7 @@ public class BasProductCodeController extends BaseController
@PreAuthorize("@ss.hasPermi('bas:BasProductCode:remove')") @PreAuthorize("@ss.hasPermi('bas:BasProductCode:remove')")
@Log(title = "条码打印", businessType = BusinessType.DELETE) @Log(title = "条码打印", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) public AjaxResult remove(@PathVariable Long[] ids)
{ {
return toAjax(basProductCodeService.deleteBasProductCodeByIds(ids)); return toAjax(basProductCodeService.deleteBasProductCodeByIds(ids));
} }

124
ruoyi-admin/src/main/java/com/ruoyi/bas/BasProductCode/domain/BasProductCode.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.bas.BasProductCode.domain; package com.ruoyi.bas.BasProductCode.domain;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
@@ -7,16 +8,16 @@ import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 条码打印对象 bas_product_code * 条码打印对象 bas_product_code
* *
* @author gw * @author gw
* @date 2025-09-11 * @date 2025-09-12
*/ */
public class BasProductCode extends BaseEntity public class BasProductCode extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键 */ /** 主键 */
private String id; private Long id;
/** 型号 */ /** 型号 */
@Excel(name = "型号") @Excel(name = "型号")
@@ -44,155 +45,202 @@ public class BasProductCode extends BaseEntity
/** 净重 */ /** 净重 */
@Excel(name = "净重") @Excel(name = "净重")
@JsonProperty("nW")
private String nW; private String nW;
/** 毛重 */ /** 毛重 */
@Excel(name = "毛重") @Excel(name = "毛重")
@JsonProperty("gW")
private String gW; private String gW;
/** 类型 */ /** 类型（1为未打印，2为已打印） */
@Excel(name = "类型") @Excel(name = "类型", readConverterExp = "1=为未打印，2为已打印")
private String type; private String type;
/** $column.columnComment */ /** 订单号 */
@Excel(name = "订单号")
private String spare1; private String spare1;
/** $column.columnComment */ /** 机型 */
@Excel(name = "机型")
private String spare2; private String spare2;
/** $column.columnComment */ /** 分销 */
@Excel(name = "分销")
private String spare3; private String spare3;
public void setId(String id) /** 备用字段1 */
@Excel(name = "备用字段1")
private String spare4;
/** 备用字段2 */
@Excel(name = "备用字段2")
private String spare5;
/** 备用字段3 */
@Excel(name = "备用字段3")
private String spare6;
public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
public String getId() public Long getId()
{ {
return id; return id;
} }
public void setModel(String model) public void setModel(String model)
{ {
this.model = model; this.model = model;
} }
public String getModel() public String getModel()
{ {
return model; return model;
} }
public void setColor(String color) public void setColor(String color)
{ {
this.color = color; this.color = color;
} }
public String getColor() public String getColor()
{ {
return color; return color;
} }
public void setSerial(String serial) public void setSerial(String serial)
{ {
this.serial = serial; this.serial = serial;
} }
public String getSerial() public String getSerial()
{ {
return serial; return serial;
} }
public void setV(String v) public void setV(String v)
{ {
this.v = v; this.v = v;
} }
public String getV() public String getV()
{ {
return v; return v;
} }
public void setHz(String hz) public void setHz(String hz)
{ {
this.hz = hz; this.hz = hz;
} }
public String getHz() public String getHz()
{ {
return hz; return hz;
} }
public void setPh(String ph) public void setPh(String ph)
{ {
this.ph = ph; this.ph = ph;
} }
public String getPh() public String getPh()
{ {
return ph; return ph;
} }
public void setNw(String nW) public void setNW(String nW)
{ {
this.nW = nW; this.nW = nW;
} }
public String getNw() public String getNW()
{ {
return nW; return nW;
} }
public void setGw(String gW) public void setGW(String gW)
{ {
this.gW = gW; this.gW = gW;
} }
public String getGw() public String getGW()
{ {
return gW; return gW;
} }
public void setType(String type) public void setType(String type)
{ {
this.type = type; this.type = type;
} }
public String getType() public String getType()
{ {
return type; return type;
} }
public void setSpare1(String spare1) public void setSpare1(String spare1)
{ {
this.spare1 = spare1; this.spare1 = spare1;
} }
public String getSpare1() public String getSpare1()
{ {
return spare1; return spare1;
} }
public void setSpare2(String spare2) public void setSpare2(String spare2)
{ {
this.spare2 = spare2; this.spare2 = spare2;
} }
public String getSpare2() public String getSpare2()
{ {
return spare2; return spare2;
} }
public void setSpare3(String spare3) public void setSpare3(String spare3)
{ {
this.spare3 = spare3; this.spare3 = spare3;
} }
public String getSpare3() public String getSpare3()
{ {
return spare3; return spare3;
} }
public void setSpare4(String spare4)
{
this.spare4 = spare4;
}
public String getSpare4()
{
return spare4;
}
public void setSpare5(String spare5)
{
this.spare5 = spare5;
}
public String getSpare5()
{
return spare5;
}
public void setSpare6(String spare6)
{
this.spare6 = spare6;
}
public String getSpare6()
{
return spare6;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -203,12 +251,16 @@ public class BasProductCode extends BaseEntity
.append("v", getV()) .append("v", getV())
.append("hz", getHz()) .append("hz", getHz())
.append("ph", getPh()) .append("ph", getPh())
.append("nW", getNw()) .append("nW", getNW())
.append("gW", getGw()) .append("gW", getGW())
.append("type", getType()) .append("type", getType())
.append("spare1", getSpare1()) .append("spare1", getSpare1())
.append("spare2", getSpare2()) .append("spare2", getSpare2())
.append("spare3", getSpare3()) .append("spare3", getSpare3())
.append("createTime", getCreateTime())
.append("spare4", getSpare4())
.append("spare5", getSpare5())
.append("spare6", getSpare6())
.toString(); .toString();
} }
} }

8
ruoyi-admin/src/main/java/com/ruoyi/bas/BasProductCode/mapper/BasProductCodeMapper.java
View File

@@ -7,7 +7,7 @@ import com.ruoyi.bas.BasProductCode.domain.BasProductCode;
* 条码打印Mapper接口 * 条码打印Mapper接口
* *
* @author gw * @author gw
* @date 2025-09-11 * @date 2025-09-12
*/ */
public interface BasProductCodeMapper public interface BasProductCodeMapper
{ {
@@ -17,7 +17,7 @@ public interface BasProductCodeMapper
* @param id 条码打印主键 * @param id 条码打印主键
* @return 条码打印 * @return 条码打印
*/ */
public BasProductCode selectBasProductCodeById(String id); public BasProductCode selectBasProductCodeById(Long id);
/** /**
* 查询条码打印列表 * 查询条码打印列表
@@ -49,7 +49,7 @@ public interface BasProductCodeMapper
* @param id 条码打印主键 * @param id 条码打印主键
* @return 结果 * @return 结果
*/ */
public int deleteBasProductCodeById(String id); public int deleteBasProductCodeById(Long id);
/** /**
* 批量删除条码打印 * 批量删除条码打印
@@ -57,5 +57,5 @@ public interface BasProductCodeMapper
* @param ids 需要删除的数据主键集合 * @param ids 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
public int deleteBasProductCodeByIds(String[] ids); public int deleteBasProductCodeByIds(Long[] ids);
} }

8
ruoyi-admin/src/main/java/com/ruoyi/bas/BasProductCode/service/IBasProductCodeService.java
View File

@@ -7,7 +7,7 @@ import com.ruoyi.bas.BasProductCode.domain.BasProductCode;
* 条码打印Service接口 * 条码打印Service接口
* *
* @author gw * @author gw
* @date 2025-09-11 * @date 2025-09-12
*/ */
public interface IBasProductCodeService public interface IBasProductCodeService
{ {
@@ -17,7 +17,7 @@ public interface IBasProductCodeService
* @param id 条码打印主键 * @param id 条码打印主键
* @return 条码打印 * @return 条码打印
*/ */
public BasProductCode selectBasProductCodeById(String id); public BasProductCode selectBasProductCodeById(Long id);
/** /**
* 查询条码打印列表 * 查询条码打印列表
@@ -49,7 +49,7 @@ public interface IBasProductCodeService
* @param ids 需要删除的条码打印主键集合 * @param ids 需要删除的条码打印主键集合
* @return 结果 * @return 结果
*/ */
public int deleteBasProductCodeByIds(String[] ids); public int deleteBasProductCodeByIds(Long[] ids);
/** /**
* 删除条码打印信息 * 删除条码打印信息
@@ -57,5 +57,5 @@ public interface IBasProductCodeService
* @param id 条码打印主键 * @param id 条码打印主键
* @return 结果 * @return 结果
*/ */
public int deleteBasProductCodeById(String id); public int deleteBasProductCodeById(Long id);
} }

31
ruoyi-admin/src/main/java/com/ruoyi/bas/BasProductCode/service/impl/BasProductCodeServiceImpl.java
View File

@@ -1,8 +1,7 @@
package com.ruoyi.bas.BasProductCode.service.impl; package com.ruoyi.bas.BasProductCode.service.impl;
import java.util.List; import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import cn.hutool.core.util.IdUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.bas.BasProductCode.mapper.BasProductCodeMapper; import com.ruoyi.bas.BasProductCode.mapper.BasProductCodeMapper;
@@ -11,31 +10,31 @@ import com.ruoyi.bas.BasProductCode.service.IBasProductCodeService;
/** /**
* 条码打印Service业务层处理 * 条码打印Service业务层处理
* *
* @author gw * @author gw
* @date 2025-09-11 * @date 2025-09-12
*/ */
@Service @Service
public class BasProductCodeServiceImpl implements IBasProductCodeService public class BasProductCodeServiceImpl implements IBasProductCodeService
{ {
@Autowired @Autowired
private BasProductCodeMapper basProductCodeMapper; private BasProductCodeMapper basProductCodeMapper;
/** /**
* 查询条码打印 * 查询条码打印
* *
* @param id 条码打印主键 * @param id 条码打印主键
* @return 条码打印 * @return 条码打印
*/ */
@Override @Override
public BasProductCode selectBasProductCodeById(String id) public BasProductCode selectBasProductCodeById(Long id)
{ {
return basProductCodeMapper.selectBasProductCodeById(id); return basProductCodeMapper.selectBasProductCodeById(id);
} }
/** /**
* 查询条码打印列表 * 查询条码打印列表
* *
* @param basProductCode 条码打印 * @param basProductCode 条码打印
* @return 条码打印 * @return 条码打印
*/ */
@@ -47,21 +46,21 @@ public class BasProductCodeServiceImpl implements IBasProductCodeService
/** /**
* 新增条码打印 * 新增条码打印
* *
* @param basProductCode 条码打印 * @param basProductCode 条码打印
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertBasProductCode(BasProductCode basProductCode) public int insertBasProductCode(BasProductCode basProductCode)
{ {
// 使用雪花算法生成ID basProductCode.setCreateTime(DateUtils.getNowDate());
basProductCode.setId(IdUtil.simpleUUID()); basProductCode.setType("1");
return basProductCodeMapper.insertBasProductCode(basProductCode); return basProductCodeMapper.insertBasProductCode(basProductCode);
} }
/** /**
* 修改条码打印 * 修改条码打印
* *
* @param basProductCode 条码打印 * @param basProductCode 条码打印
* @return 结果 * @return 结果
*/ */
@@ -73,24 +72,24 @@ public class BasProductCodeServiceImpl implements IBasProductCodeService
/** /**
* 批量删除条码打印 * 批量删除条码打印
* *
* @param ids 需要删除的条码打印主键 * @param ids 需要删除的条码打印主键
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteBasProductCodeByIds(String[] ids) public int deleteBasProductCodeByIds(Long[] ids)
{ {
return basProductCodeMapper.deleteBasProductCodeByIds(ids); return basProductCodeMapper.deleteBasProductCodeByIds(ids);
} }
/** /**
* 删除条码打印信息 * 删除条码打印信息
* *
* @param id 条码打印主键 * @param id 条码打印主键
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteBasProductCodeById(String id) public int deleteBasProductCodeById(Long id)
{ {
return basProductCodeMapper.deleteBasProductCodeById(id); return basProductCodeMapper.deleteBasProductCodeById(id);
} }

28
ruoyi-admin/src/main/resources/mapper/bas/BasProductCodeMapper.xml
View File

@@ -18,10 +18,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare1" column="spare1" /> <result property="spare1" column="spare1" />
<result property="spare2" column="spare2" /> <result property="spare2" column="spare2" />
<result property="spare3" column="spare3" /> <result property="spare3" column="spare3" />
<result property="createTime" column="create_time" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
</resultMap> </resultMap>
<sql id="selectBasProductCodeVo"> <sql id="selectBasProductCodeVo">
select id, model, color, serial, v, hz, ph, n_w, g_w, type, spare1, spare2, spare3 from bas_product_code select id, model, color, serial, v, hz, ph, n_w, g_w, type, spare1, spare2, spare3, create_time, spare4, spare5, spare6 from bas_product_code
</sql> </sql>
<select id="selectBasProductCodeList" parameterType="BasProductCode" resultMap="BasProductCodeResult"> <select id="selectBasProductCodeList" parameterType="BasProductCode" resultMap="BasProductCodeResult">
@@ -36,10 +40,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="nW != null and nW != ''"> and n_w like concat('%', #{nW}, '%')</if> <if test="nW != null and nW != ''"> and n_w like concat('%', #{nW}, '%')</if>
<if test="gW != null and gW != ''"> and g_w like concat('%', #{gW}, '%')</if> <if test="gW != null and gW != ''"> and g_w like concat('%', #{gW}, '%')</if>
<if test="type != null and type != ''"> and type = #{type}</if> <if test="type != null and type != ''"> and type = #{type}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
</where> </where>
</select> </select>
<select id="selectBasProductCodeById" parameterType="String" resultMap="BasProductCodeResult"> <select id="selectBasProductCodeById" parameterType="Long" resultMap="BasProductCodeResult">
<include refid="selectBasProductCodeVo"/> <include refid="selectBasProductCodeVo"/>
where id = #{id} where id = #{id}
</select> </select>
@@ -60,6 +70,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare1 != null">spare1,</if> <if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if> <if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if> <if test="spare3 != null">spare3,</if>
<if test="createTime != null">create_time,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if> <if test="id != null">#{id},</if>
@@ -75,6 +89,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare1 != null">#{spare1},</if> <if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if> <if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if> <if test="spare3 != null">#{spare3},</if>
<if test="createTime != null">#{createTime},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
</trim> </trim>
</insert> </insert>
@@ -93,11 +111,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare1 != null">spare1 = #{spare1},</if> <if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if> <if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if> <if test="spare3 != null">spare3 = #{spare3},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
<delete id="deleteBasProductCodeById" parameterType="String"> <delete id="deleteBasProductCodeById" parameterType="Long">
delete from bas_product_code where id = #{id} delete from bas_product_code where id = #{id}
</delete> </delete>

1190
ruoyi-ui/src/views/bas/BasProductCode/index.vue
View File

File diff suppressed because it is too large Load Diff

32
ruoyi-ui/src/views/bas/basProduct/index.vue
View File

@@ -138,14 +138,14 @@
<!-- <el-table-column label="主键" align="center" prop="productGuid" />--> <!-- <el-table-column label="主键" align="center" prop="productGuid" />-->
<el-table-column label="物料编码" align="center" prop="productId" /> <el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" /> <el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="序列号" align="center" prop="spare4" />
<el-table-column label="相位" align="center" prop="spare7" />
<el-table-column label="型号" align="center" prop="spare1" /> <el-table-column label="型号" align="center" prop="spare1" />
<el-table-column label="净重" align="center" prop="spare2" />
<el-table-column label="毛重" align="center" prop="spare8" />
<el-table-column label="颜色" align="center" prop="spare3" /> <el-table-column label="颜色" align="center" prop="spare3" />
<el-table-column label="序列号" align="center" prop="spare4" />
<el-table-column label="电压" align="center" prop="spare5" /> <el-table-column label="电压" align="center" prop="spare5" />
<el-table-column label="功率" align="center" prop="spare6" /> <el-table-column label="功率" align="center" prop="spare6" />
<el-table-column label="相位" align="center" prop="spare7" />
<el-table-column label="净重" align="center" prop="spare2" />
<el-table-column label="毛重" align="center" prop="spare8" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -184,30 +184,30 @@
<el-form-item label="物料名称" prop="productName"> <el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" /> <el-input v-model="form.productName" placeholder="请输入物料名称" />
</el-form-item> </el-form-item>
<el-form-item label="序列号" prop="spare4">
<el-input v-model="form.spare4" placeholder="请输入序列号" />
</el-form-item>
<el-form-item label="相位" prop="spare7">
<el-input v-model="form.spare7" placeholder="请输入相位" />
</el-form-item>
<el-form-item label="型号" prop="spare1"> <el-form-item label="型号" prop="spare1">
<el-input v-model="form.spare1" placeholder="请输入型号" /> <el-input v-model="form.spare1" placeholder="请输入型号" />
</el-form-item> </el-form-item>
<el-form-item label="净重" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入净重" />
</el-form-item>
<el-form-item label="毛重" prop="spare8">
<el-input v-model="form.spare8" placeholder="请输入毛重" />
</el-form-item>
<el-form-item label="颜色" prop="spare3"> <el-form-item label="颜色" prop="spare3">
<el-input v-model="form.spare3" placeholder="请输入颜色" /> <el-input v-model="form.spare3" placeholder="请输入颜色" />
</el-form-item> </el-form-item>
<el-form-item label="序列号" prop="spare4">
<el-input v-model="form.spare4" placeholder="请输入序列号" />
</el-form-item>
<el-form-item label="电压" prop="spare5"> <el-form-item label="电压" prop="spare5">
<el-input v-model="form.spare5" placeholder="请输入电压" /> <el-input v-model="form.spare5" placeholder="请输入电压" />
</el-form-item> </el-form-item>
<el-form-item label="功率" prop="spare6"> <el-form-item label="功率" prop="spare6">
<el-input v-model="form.spare6" placeholder="请输入功率" /> <el-input v-model="form.spare6" placeholder="请输入功率" />
</el-form-item> </el-form-item>
<el-form-item label="相位" prop="spare7">
<el-input v-model="form.spare7" placeholder="请输入相位" />
</el-form-item>
<el-form-item label="净重" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入净重" />
</el-form-item>
<el-form-item label="毛重" prop="spare8">
<el-input v-model="form.spare8" placeholder="请输入毛重" />
</el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item> </el-form-item>

54
ruoyi-ui/src/views/bas/traycode/index.vue
View File

@@ -1,26 +1,26 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
<el-form-item label="格式ID" prop="formatId"> <!-- <el-form-item label="格式ID" prop="formatId">-->
<!-- <el-input <!--&lt;!&ndash; <el-input-->
v-model="queryParams.formatId" <!-- v-model="queryParams.formatId"-->
placeholder="请输入格式ID" <!-- placeholder="请输入格式ID"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/>--> <!-- />&ndash;&gt;-->
<el-select v-model="queryParams.formatId" placeholder="请选择格式ID"> <!-- <el-select v-model="queryParams.formatId" placeholder="请选择格式ID">-->
<el-option <!-- <el-option-->
v-for="item in traycodeFormatList" <!-- v-for="item in traycodeFormatList"-->
:key="item.id" <!-- :key="item.id"-->
:label="item.remarks" <!-- :label="item.remarks"-->
:value="item.id" <!-- :value="item.id"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="托盘编码" prop="trayCode"> <el-form-item label="条码" prop="trayCode">
<el-input <el-input
v-model="queryParams.trayCode" v-model="queryParams.trayCode"
placeholder="请输入托盘编码" placeholder="请输入条码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@@ -92,11 +92,11 @@
<el-table ref="table" v-loading="loading" :data="traycodeList" @selection-change="handleSelectionChange" max-height="700"> <el-table ref="table" v-loading="loading" :data="traycodeList" @selection-change="handleSelectionChange" max-height="700">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="left" prop="id" width="120" /> <el-table-column label="序号" align="left" prop="id" width="120" />
<el-table-column label="格式ID" align="left" prop="formatName" /> <!-- <el-table-column label="格式ID" align="left" prop="formatName" />-->
<el-table-column label="托盘编码" align="left" prop="trayCode" /> <el-table-column label="条码" align="left" prop="trayCode" />
<!-- <el-table-column label="Spare Field 1" align="center" prop="spare1" /> <el-table-column label="Spare Field 1" align="center" prop="spare1" />
<el-table-column label="Spare Field 2" align="center" prop="spare2" /> <el-table-column label="Spare Field 2" align="center" prop="spare2" />
<el-table-column label="Spare Field 3" align="center" prop="spare3" /> --> <el-table-column label="Spare Field 3" align="center" prop="spare3" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" > <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@@ -136,7 +136,7 @@
<!-- 添加或修改条码信息对话框 --> <!-- 添加或修改条码信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="格式ID" prop="formatId"> <!-- <el-form-item label="格式ID" prop="formatId">
<el-select v-model="form.formatId" placeholder="请选择格式ID"> <el-select v-model="form.formatId" placeholder="请选择格式ID">
<el-option <el-option
v-for="item in traycodeFormatList" v-for="item in traycodeFormatList"
@@ -145,12 +145,12 @@
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>-->
<el-form-item label="托盘编码" prop="trayCode"> <el-form-item label="托盘编码" prop="trayCode">
<el-input v-model="form.trayCode" placeholder="请输入托盘编码" /> <el-input v-model="form.trayCode" placeholder="请输入托盘编码" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="Spare Field 1" prop="spare1"> <el-form-item label="Spare Field 1" prop="spare1">
<el-input v-model="form.spare1" placeholder="Enter spare field 1" /> <el-input v-model="form.spare1" placeholder="Enter spare field 1" />
</el-form-item> </el-form-item>
<el-form-item label="Spare Field 2" prop="spare2"> <el-form-item label="Spare Field 2" prop="spare2">
@@ -158,7 +158,7 @@
</el-form-item> </el-form-item>
<el-form-item label="Spare Field 3" prop="spare3"> <el-form-item label="Spare Field 3" prop="spare3">
<el-input v-model="form.spare3" placeholder="Enter spare field 3" /> <el-input v-model="form.spare3" placeholder="Enter spare field 3" />
</el-form-item> --> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确定</el-button> <el-button type="primary" @click="submitForm">确定</el-button>