xiaosuonian
/
yixindibang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.调整出厂入厂磅界面及功能。

This commit is contained in:
xiaosuonian 2025-06-19 20:52:49 +08:00
parent f07456bfb3
commit ac3bd4cfbd
18 changed files with 516 additions and 1284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
measurement/src/main/java/com/ruoyi/basedata/domain/Truepound.java
View File

@ -102,6 +102,9 @@ public class Truepound extends BaseEntity
@Excel(name = "登记部门")
private Long crtorgid;
/** 星空单据类型 */
@Excel(name = "星空单据类型")
private String oabilltype;
/** 是否启用 */
@Excel(name = "是否启用")
private String isinuse;
@ -336,7 +339,15 @@ public class Truepound extends BaseEntity
return isinuse;
}
public void setCrtdt(Date crtdt)
public String getOabilltype() {
return oabilltype;
}
public void setOabilltype(String oabilltype) {
this.oabilltype = oabilltype;
}
public void setCrtdt(Date crtdt)
{
this.crtdt = crtdt;
}

4
measurement/src/main/java/com/ruoyi/basedata/service/impl/EmpwgtdataServiceImpl.java
View File

@ -68,7 +68,9 @@ public class EmpwgtdataServiceImpl extends ServiceImpl<EmpwgtdataMapper, Empwgtd
}
//获取当前时间作为称重时间
empwgtdata.setWeighdt(new Date());
empwgtdata.setIsused("N");
if (empwgtdata.getIsused() == null){
empwgtdata.setIsused("N");
}
empwgtdata.initAddFields(empwgtdata);
//如果为true，则返回1，否则返回-1
boolean save = save(empwgtdata);

10
measurement/src/main/java/com/ruoyi/bill/controller/PoundBillController.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.bill.controller;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@ -72,7 +74,13 @@ public class PoundBillController extends BaseController
@GetMapping(value = "/getNumber")
public AjaxResult getNumber()
{
return success((Object) allNumberUtil.generateDefaultSerial(PoundBill.NUMBER_PROFIX));
//获取当前时间
Date date = new Date();
String number = allNumberUtil.generateDefaultSerial(PoundBill.NUMBER_PROFIX);
HashMap<String, Object> map = new HashMap<>();
map.put("number", number);
map.put("date", date);
return success(map);
}
/**

12
measurement/src/main/java/com/ruoyi/bill/domain/Poundappli.java
View File

@ -54,7 +54,7 @@ public class Poundappli extends BaseEntity
/** 发货单位 */
@Excel(name = "发货单位")
private Long sendunitid;
private String sendunitid;
/** 发货单位名称 */
@Excel(name = "发货单位名称")
@ -107,7 +107,7 @@ public class Poundappli extends BaseEntity
/** 磅点 */
@Excel(name = "磅点")
private Long poundid;
private String poundid;
/** 磅点名称 */
@Excel(name = "磅点名称")
@ -272,12 +272,12 @@ public class Poundappli extends BaseEntity
return specification;
}
public void setSendunitid(Long sendunitid)
public void setSendunitid(String sendunitid)
{
this.sendunitid = sendunitid;
}
public Long getSendunitid()
public String getSendunitid()
{
return sendunitid;
}
@ -402,12 +402,12 @@ public class Poundappli extends BaseEntity
return cardriver;
}
public void setPoundid(Long poundid)
public void setPoundid(String poundid)
{
this.poundid = poundid;
}
public Long getPoundid()
public String getPoundid()
{
return poundid;
}

10
measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java
View File

@ -65,6 +65,15 @@ public class PoundBillServiceImpl extends ServiceImpl<PoundBillMapper, PoundBill
@Override
public List<PoundBill> selectPoundBillList(PoundBill poundBill)
{
//针对出厂入厂磅的查询
Map<String, Object> params = poundBill.getParams();
if (params != null && !params.isEmpty()) {
Object oabilltype = params.get("oabilltype");
if (oabilltype != null) {
String[] oabilltypes = oabilltype.toString().split(",");
params.put("oabilltypes",oabilltypes);
}
}
return poundBillMapper.selectPoundBillList(poundBill);
}
@ -251,6 +260,7 @@ public class PoundBillServiceImpl extends ServiceImpl<PoundBillMapper, PoundBill
String poundid = (String) params.get("poundid");
empwgtdata.setTtsid(ttsid);
empwgtdata.setPoundid(poundid);
empwgtdata.setIsused("Y");
empwgtdataService.insertEmpwgtdata(empwgtdata);
String empDataId = empwgtdata.getId();
String empUsrcode = empwgtdata.getUsrcode();

10
measurement/src/main/java/com/ruoyi/bill/service/impl/PoundappliServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.bill.service.impl;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
@ -42,6 +43,15 @@ public class PoundappliServiceImpl extends ServiceImpl<PoundappliMapper, Poundap
@Override
public List<Poundappli> selectPoundappliList(Poundappli poundappli)
{
//针对出厂入厂磅的查询
Map<String, Object> params = poundappli.getParams();
if (params != null && !params.isEmpty()) {
Object oabilltype = params.get("oabilltype");
if (oabilltype != null) {
String[] oabilltypes = oabilltype.toString().split(",");
params.put("oabilltypes",oabilltypes);
}
}
return poundappliMapper.selectPoundappliList(poundappli);
}

3
measurement/src/main/resources/mapper/measurement/basedata/TruepoundMapper.xml
View File

@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="getdatapos" column="getdatapos" />
<result property="getdatalen" column="getdatalen" />
<result property="crtorgid" column="crtorgid" />
<result property="oabilltype" column="oabilltype" />
<result property="remark" column="remark" />
<result property="isinuse" column="isinuse" />
<result property="crtdt" column="crtdt" />
@ -33,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTruepoundVo">
select id, usrcode, name, type,poundtype,poundclass, mac, comport, commset, datacoding, dataord, datarec, datalen, startFlag, endflag, tranratio, getdatapos, getdatalen, crtorgid, remark, isinuse, crtdt, crtopr, lstedtdt, lstedtopr from t_data_truepound
select id, usrcode, name, type,poundtype,poundclass, mac, comport, commset, datacoding, dataord, datarec, datalen, startFlag, endflag, tranratio, getdatapos, getdatalen, crtorgid,oabilltype, remark, isinuse, crtdt, crtopr, lstedtdt, lstedtopr from t_data_truepound
</sql>
<select id="selectTruepoundList" parameterType="Truepound" resultMap="TruepoundResult">

6
measurement/src/main/resources/mapper/measurement/bill/PoundBillMapper.xml
View File

@ -152,6 +152,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="crtopr != null and crtopr != ''"> and crtopr = #{crtopr}</if>
<if test="lstedtdt != null "> and lstedtdt = #{lstedtdt}</if>
<if test="lstedtopr != null and lstedtopr != ''"> and lstedtopr = #{lstedtopr}</if>
<if test="params.oabilltypes != null and params.oabilltypes != ''">
AND srcblltype IN
<foreach collection="params.oabilltypes" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
order by crtdt desc
</select>

8
measurement/src/main/resources/mapper/measurement/bill/PoundappliMapper.xml
View File

@ -84,6 +84,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="zgsName != null and zgsName != ''"> and zgsName = #{zgsName}</if>
<if test="fentity_fentryid != null and fentity_fentryid != ''"> and fentity_fentryid = #{fentity_fentryid}</if>
<if test="oabilltype != null and oabilltype != ''"> and oabilltype = #{oabilltype}</if>
<if test="params.oabilltypes != null and params.oabilltypes != ''">
AND srcbilltype IN
<foreach collection="params.oabilltypes" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
order by crtdt desc
</select>

12
ruoyi-ui/src/api/tool/util.js Normal file
View File

@ -0,0 +1,12 @@
export function mulToArray(value) {
return value ? value.split(',') : [];
}
export function mulToString(value) {
return Array.isArray(value) ? value.join(',') : value;
}

2
ruoyi-ui/src/router/index.js
View File

@ -68,7 +68,7 @@ export const constantRoutes = [
children: [
{
path: 'index',
component: () => import('@/views/index'),
component: () => import('@/views/index.vue'),
name: 'Index',
meta: { title: '首页', icon: 'dashboard', affix: true }
}

1091
ruoyi-ui/src/views/index.vue
View File

File diff suppressed because it is too large Load Diff

BIN
ruoyi-ui/src/views/indexImg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 MiB

6
ruoyi-ui/src/views/login.vue
View File

@ -73,8 +73,10 @@ export default {
title: process.env.VUE_APP_TITLE,
codeUrl: "",
loginForm: {
username: "admin",
password: "admin123",
// username: "admin",
// password: "admin123",
username: "",
password: "",
rememberMe: false,
code: "",
uuid: ""

356
ruoyi-ui/src/views/measurement/basedata/truepound/index.vue
View File

@ -341,141 +341,223 @@
/>
<!-- 添加或修改物理磅点对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="1500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="磅点编号" prop="usrcode">
<el-input v-model="form.usrcode" placeholder="请输入磅点编号" />
</el-form-item>
<el-form-item label="磅点名称" prop="name">
<el-input v-model="form.name" placeholder="请输入磅点名称" />
</el-form-item>
<el-form-item label="磅点类型" prop="type">
<el-select v-model="form.type" placeholder="请选择磅点类型">
<el-option
v-for="dict in dict.type.poundtype"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="磅点类型" prop="poundtype">
<el-select v-model="form.poundtype" placeholder="请选择磅点类型">
<el-option
v-for="dict in dict.type.poundoutintype"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="磅点种类" prop="poundclass">
<el-select v-model="form.poundclass" placeholder="请选择磅点种类">
<el-option
v-for="dict in dict.type.weighttype"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="网卡地址" prop="mac">
<el-input v-model="form.mac" placeholder="请输入网卡地址" />
</el-form-item>
<el-form-item label="串口号" prop="comport">
<el-select v-model="form.comport" placeholder="请选择串口号">
<el-option
v-for="dict in dict.type.comport"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="通信参数" prop="commset">
<el-input v-model="form.commset" placeholder="请输入通信参数" />
</el-form-item>
<el-form-item label="数据编码格式" prop="datacoding">
<el-select v-model="form.datacoding" placeholder="请选择数据编码格式">
<el-option
v-for="dict in dict.type.datacoding"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="数据顺序" prop="dataord">
<el-select v-model="form.dataord" placeholder="请选择数据顺序">
<el-option
v-for="dict in dict.type.dataord"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="每次接收长度" prop="datarec">
<el-input v-model="form.datarec" placeholder="请输入每次接收长度" />
</el-form-item>
<el-form-item label="数据长度" prop="datalen">
<el-input v-model="form.datalen" placeholder="请输入数据长度" />
</el-form-item>
<el-form-item label="开始标志" prop="startFlag">
<el-input v-model="form.startFlag" placeholder="请输入开始标志" />
</el-form-item>
<el-form-item label="结束标志" prop="endflag">
<el-input v-model="form.endflag" placeholder="请输入结束标志" />
</el-form-item>
<el-form-item label="转换系数" prop="tranratio">
<el-input v-model="form.tranratio" placeholder="请输入转换系数" />
</el-form-item>
<el-form-item label="取数开始位置" prop="getdatapos">
<el-input v-model="form.getdatapos" placeholder="请输入取数开始位置" />
</el-form-item>
<el-form-item label="取数长度" prop="getdatalen">
<el-input v-model="form.getdatalen" placeholder="请输入取数长度" />
</el-form-item>
<el-form-item label="登记部门" prop="crtorgid">
<el-input v-model="form.crtorgid" placeholder="请输入登记部门" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="业务磅点" prop="buspoundid">
<search-select
v-model="form.buspoundid"
params="t_data_buspound;id;concat(name,' ',usrcode)"
where = ""
orderby="usrcode asc"
:clearable = "true"
></search-select>
</el-form-item>
<el-form-item label="是否启用" prop="isinuse">
<el-input v-model="form.isinuse" placeholder="请输入是否启用" />
</el-form-item>
<el-form-item label="创建时间" prop="crtdt">
<el-date-picker clearable
v-model="form.crtdt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item label="创建人" prop="crtopr">
<el-input v-model="form.crtopr" placeholder="请输入创建人" />
</el-form-item>
<el-form-item label="最后修改日期" prop="lstedtdt">
<el-date-picker clearable
v-model="form.lstedtdt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择最后修改日期">
</el-date-picker>
</el-form-item>
<el-form-item label="最后修改人" prop="lstedtopr">
<el-input v-model="form.lstedtopr" placeholder="请输入最后修改人" />
</el-form-item>
<el-row>
<el-col :span="6">
<el-form-item label="磅点编号" prop="usrcode">
<el-input v-model="form.usrcode" placeholder="请输入磅点编号" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="磅点名称" prop="name">
<el-input v-model="form.name" placeholder="请输入磅点名称" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="磅点类型" prop="type">
<el-select v-model="form.type" placeholder="请选择磅点类型">
<el-option
v-for="dict in dict.type.poundtype"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="磅点类型" prop="poundtype">
<el-select v-model="form.poundtype" placeholder="请选择磅点类型">
<el-option
v-for="dict in dict.type.poundoutintype"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="磅点种类" prop="poundclass">
<el-select v-model="form.poundclass" placeholder="请选择磅点种类">
<el-option
v-for="dict in dict.type.weighttype"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="网卡地址" prop="mac">
<el-input v-model="form.mac" placeholder="请输入网卡地址" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="串口号" prop="comport">
<el-select v-model="form.comport" placeholder="请选择串口号">
<el-option
v-for="dict in dict.type.comport"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="通信参数" prop="commset">
<el-input v-model="form.commset" placeholder="请输入通信参数" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="数据编码格式" prop="datacoding">
<el-select v-model="form.datacoding" placeholder="请选择数据编码格式">
<el-option
v-for="dict in dict.type.datacoding"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="数据顺序" prop="dataord">
<el-select v-model="form.dataord" placeholder="请选择数据顺序">
<el-option
v-for="dict in dict.type.dataord"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="每次接收长度" prop="datarec">
<el-input v-model="form.datarec" placeholder="请输入每次接收长度" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="数据长度" prop="datalen">
<el-input v-model="form.datalen" placeholder="请输入数据长度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="开始标志" prop="startFlag">
<el-input v-model="form.startFlag" placeholder="请输入开始标志" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="结束标志" prop="endflag">
<el-input v-model="form.endflag" placeholder="请输入结束标志" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="转换系数" prop="tranratio">
<el-input v-model="form.tranratio" placeholder="请输入转换系数" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="取数开始位置" prop="getdatapos">
<el-input v-model="form.getdatapos" placeholder="请输入取数开始位置" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="取数长度" prop="getdatalen">
<el-input v-model="form.getdatalen" placeholder="请输入取数长度" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="登记部门" prop="crtorgid">
<el-input v-model="form.crtorgid" placeholder="请输入登记部门" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="星空单据类型" prop="oabilltype">
<el-select v-model="form.oabilltype" multiple placeholder="请选择星空单据类型">
<el-option
v-for="dict in dict.type.oa_formid"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="业务磅点" prop="buspoundid">
<search-select
v-model="form.buspoundid"
params="t_data_buspound;id;concat(name,' ',usrcode)"
where = ""
orderby="usrcode asc"
:clearable = "true"
></search-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否启用" prop="isinuse">
<el-input v-model="form.isinuse" placeholder="请输入是否启用" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建时间" prop="crtdt">
<el-date-picker clearable
v-model="form.crtdt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建人" prop="crtopr">
<el-input v-model="form.crtopr" placeholder="请输入创建人" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="最后修改日期" prop="lstedtdt">
<el-date-picker clearable
v-model="form.lstedtdt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择最后修改日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="最后修改人" prop="lstedtopr">
<el-input v-model="form.lstedtopr" placeholder="请输入最后修改人" />
</el-form-item>
</el-col>
<el-col :span="6">
</el-col>
<el-col :span="6">
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -488,11 +570,11 @@
<script>
import { listTruepound, getTruepound, delTruepound, addTruepound, updateTruepound } from "@/api/measurement/basedata/truepound"
import SearchSelect from "@/components/SearchSelect/index.vue";
import {mulToString,mulToArray} from "@/api/tool/util.js"
export default {
name: "Truepound",
components: {SearchSelect},
dicts: ['poundtype', 'dataord', 'comport', 'datacoding','poundoutintype','weighttype'],
dicts: ['poundtype', 'dataord', 'comport', 'datacoding','poundoutintype','weighttype','oa_formid'],
data() {
return {
// 遮罩层
@ -628,6 +710,7 @@ export default {
const id = row.id || this.ids
getTruepound(id).then(response => {
this.form = response.data
this.form.oabilltype = mulToArray(this.form.oabilltype);
this.open = true
this.title = "修改物理磅点"
})
@ -636,6 +719,7 @@ export default {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.form.oabilltype = mulToString(this.form.oabilltype);
if (this.form.id != null) {
updateTruepound(this.form).then(response => {
this.$modal.msgSuccess("修改成功")

21
ruoyi-ui/src/views/measurement/bill/poundappli/index.vue
View File

@ -144,7 +144,11 @@
<el-table-column label="驾驶员" align="center" prop="cardriver" />
<el-table-column label="磅点" align="center" prop="poundid" />
<el-table-column label="磅点名称" align="center" prop="poundname" />
<el-table-column label="来源单据类型" align="center" prop="srcbilltype" />
<el-table-column label="来源单据类型" align="center" prop="srcbilltype" >
<template slot-scope="scope">
<dict-tag :options="dict.type.oa_formid" :value="scope.row.srcbilltype"/>
</template>
</el-table-column>
<el-table-column label="来源单号" align="center" prop="srcbillusrcode" />
<el-table-column label="登记部门" align="center" prop="crtorgid" />
<el-table-column label="是否启用" align="center" prop="isinuse" />
@ -346,7 +350,14 @@
</el-col>
<el-col :span="6">
<el-form-item label="来源单据类型" prop="srcbilltype">
<el-input v-model="form.srcbilltype" placeholder="来源单据类型" />
<el-select v-model="form.srcbilltype" placeholder="请选择来源单据类型">
<el-option
v-for="dict in dict.type.oa_formid"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
@ -391,10 +402,10 @@
<script>
import { listPoundappli, getPoundappli, delPoundappli, addPoundappli, updatePoundappli } from "@/api/measurement/bill/poundappli"
import {mulToString,mulToArray} from "@/api/tool/util.js"
export default {
name: "Poundappli",
dicts: ['pound_status'],
dicts: ['pound_status','oa_formid'],
data() {
return {
// 遮罩层
@ -540,6 +551,7 @@ export default {
const id = row.id || this.ids
getPoundappli(id).then(response => {
this.form = response.data
// this.form.srcbilltype = mulToArray(this.form.srcbilltype);
this.open = true
this.title = "修改过磅申请"
})
@ -548,6 +560,7 @@ export default {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
// this.form.srcbilltype = mulToString(this.form.srcbilltype);
if (this.form.id != null) {
updatePoundappli(this.form).then(response => {
this.$modal.msgSuccess("修改成功")

6
ruoyi-ui/src/views/measurement/bill/poundbill/index.vue
View File

@ -507,7 +507,7 @@
<el-form-item label="来源单据类型" prop="srcblltype">
<el-select v-model="form.srcblltype" placeholder="请选择来源单据类型">
<el-option
v-for="dict in dict.type.sys_yes_no"
v-for="dict in dict.type.oa_formid"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -623,7 +623,7 @@ import { listPoundbill,getNumber, getPoundbill, delPoundbill, addPoundbill, upda
export default {
name: "Poundbill",
dicts: ['pound_status', 'pound', 'sys_yes_no'],
dicts: ['pound_status', 'pound', 'sys_yes_no','oa_formid'],
data() {
return {
// 遮罩层
@ -818,7 +818,7 @@ export default {
this.open = true
this.title = "添加磅单信息"
getNumber().then(response => {
this.form.usrcode = response.data
this.form.usrcode = response.data.number
})
},
/** 修改按钮操作 */

230
ruoyi-ui/src/views/measurement/operation/outinpound/index.vue
View File

@ -148,12 +148,14 @@
<el-row>
<el-col :span="6">
<el-form-item label="皮重" prop="empmqty">
<el-input v-model="form.empmqty" placeholder="" />
<el-input v-model="form.empmqty" placeholder=""
readonly/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="原净重" prop="srccleanmqty">
<el-input v-model="form.srccleanmqty" placeholder="" />
<el-input v-model="form.srccleanmqty" placeholder=""
readonly/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -167,12 +169,14 @@
<el-row>
<el-col :span="6">
<el-form-item label="净重" prop="netmqty">
<el-input v-model="form.netmqty" placeholder="" />
<el-input v-model="form.netmqty" placeholder=""
readonly/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="净重差" prop="">
<el-input v-model="form.netdiffqty" placeholder="" />
<el-input v-model="form.netdiffqty" placeholder=""
readonly/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -210,23 +214,19 @@
</el-form>
<!-- 底部两个列表区域 -->
<div style=" width: 1450px; overflow: hidden">
<el-card>
<div style="width: 5000px">
<div>
<el-button
v-for="tab in tabs"
:key="tab.name"
:type="activeTab === tab.name ? 'primary' : 'default'"
@click="activeTab = tab.name"
size="mini"
class="transition-all duration-200"
>
{{ tab.label }}
</el-button>
</div>
<div >
<el-table style="width: 950px; display: inline-block;float:left;"
<el-row>
<el-col :span="16">
<el-button
v-for="tab in tabs"
:key="tab.name"
:type="activeTab === tab.name ? 'primary' : 'default'"
@click="activeTab = tab.name"
size="mini"
>
{{ tab.label }}
</el-button>
<el-table
v-loading="loading"
:data="poundappliList"
v-show="activeTab === 'weighingRequest'"
@ -236,6 +236,7 @@
ref="table1"
@row-click="handleRowClick"
@row-dblclick="handleRowDoubleClick"
height="500"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="申请日期" align="center" prop="bsndt" width="180">
@ -257,7 +258,14 @@
<el-table-column label="来源单据类型" align="center" prop="srcbilltype" />
<el-table-column label="来源单号" align="center" prop="srcbillusrcode" />
</el-table>
<el-table style="width: 950px; display: inline-block;float:left;"
<pagination
v-show="queryPageParams.weighingRequest.total>0 && activeTab === 'weighingRequest'"
:total="queryPageParams.weighingRequest.total"
:page.sync="queryPageParams.weighingRequest.pageNum"
:limit.sync="queryPageParams.weighingRequest.pageSize"
@pagination="handleSearchPoundappli"
/>
<el-table
v-loading="loading"
:data="tareappliList"
v-show="activeTab === 'tareRequest'"
@ -267,6 +275,7 @@
ref="table2"
@row-click="tareHandleRowClick"
@row-dblclick="tareHandleRowDoubleClick"
height="500"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="磅单号" align="center" prop="usrcode" />
@ -299,33 +308,146 @@
<el-table-column label="承运商" align="center" prop="trnunitname" />
<el-table-column label="驾驶员" align="center" prop="cardriver" />
</el-table>
<el-table style="width: 950px; display: inline-block;float:left;"
<pagination
v-show="queryPageParams.tareRequest.total>0 && activeTab === 'tareRequest'"
:total="queryPageParams.tareRequest.total"
:page.sync="queryPageParams.tareRequest.pageNum"
:limit.sync="queryPageParams.tareRequest.pageSize"
@pagination="handleSearchTareappli"
/>
<el-form :model="queryParams" v-if="activeTab === 'weightInfo'" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="起始日期" prop="lstedtdt">
<el-date-picker clearable
v-model="queryParams.lstedtdt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择最后修改时间">
</el-date-picker>
</el-form-item>
<el-form-item label="截止日期" prop="lstedtdt">
<el-date-picker clearable
v-model="queryParams.lstedtdt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择最后修改时间">
</el-date-picker>
</el-form-item>
<el-form-item label="车号" prop="carno" label-width="40">
<el-input
v-model="queryParams.carno"
placeholder="请输入车号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="磅单号" prop="usrcode" label-width="40">
<el-input
v-model="queryParams.usrcode"
placeholder="请输入磅单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-button class="transition-all duration-200" type="primary" size="mini" @click="QueryPoundList">查询磅单</el-button>
</el-form>
<el-table
v-loading="loading"
:data="outinpoundList"
:data="poundbillList"
v-show="activeTab === 'weightInfo'"
border
stripe
@selection-change="handleSelectionChange">
@selection-change="handleSelectionChange"
height="500"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="按钮3" align="center" prop="id" />
<el-table-column label="状态" align="center" prop="billstate">
<template slot-scope="scope">
<dict-tag :options="dict.type.pound_status" :value="scope.row.billstate"/>
</template>
</el-table-column>
<el-table-column label="磅单号" align="center" prop="usrcode" />
<el-table-column label="车号/车厢" align="center" prop="carno" />
<el-table-column label="毛重" align="center" prop="wghmqty" />
<el-table-column label="皮重" align="center" prop="empmqty" />
<el-table-column label="净重" align="center" prop="netmqty" />
<el-table-column label="过重磅时间" align="center" prop="wghdt" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.wghdt, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="过皮重时间" align="center" prop="empdt" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.empdt, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="原磅单号" align="center" prop="srcpunmqty" />
<el-table-column label="原毛重" align="center" prop="srcwghmqty" />
<el-table-column label="原皮重" align="center" prop="srcempmqty" />
<el-table-column label="原净重" align="center" prop="srcnetmqty" />
<el-table-column label="名称" align="center" prop="itmname" />
<el-table-column label="毛重司磅员" align="center" prop="wghdtoprname" />
<el-table-column label="皮重司磅员" align="center" prop="empdtoprname" />
<el-table-column label="规格" align="center" prop="specification" />
<el-table-column label="计量单位" align="center" prop="msrname" />
<el-table-column label="磅点" align="center" prop="poundid">
<template slot-scope="scope">
<dict-tag :options="dict.type.pound" :value="scope.row.poundid"/>
</template>
</el-table-column>
<el-table-column label="磅点名称" align="center" prop="poundname" />
<el-table-column label="皮重称重id" align="center" prop="empsysid" />
<el-table-column label="皮重单号" align="center" prop="empusrcode" />
<el-table-column label="毛重id" align="center" prop="wghsysid" />
<el-table-column label="毛重单号" align="center" prop="wghusrcode" />
<el-table-column label="收货单位" align="center" prop="recunitid" />
<el-table-column label="收货单位名称" align="center" prop="recunitname" />
<el-table-column label="发货单位" align="center" prop="sendunitid" />
<el-table-column label="发货单位名称" align="center" prop="sendunitname" />
<el-table-column label="承运单位" align="center" prop="trnunitid" />
<el-table-column label="承运单位名称" align="center" prop="trnunitname" />
<el-table-column label="业务单位" align="center" prop="bsnunitid" />
<el-table-column label="业务单位名称" align="center" prop="bsnunitname" />
<el-table-column label="业务部门id" align="center" prop="bsndptid" />
<el-table-column label="业务部门名称" align="center" prop="bsndptname" />
<el-table-column label="过磅类型" align="center" prop="wghtype">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.wghtype"/>
</template>
</el-table-column>
<el-table-column label="称重方式" align="center" prop="scltype">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.scltype"/>
</template>
</el-table-column>
<el-table-column label="驾驶员" align="center" prop="cardriver" />
<el-table-column label="来源单据类型" align="center" prop="srcblltype">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.srcblltype"/>
</template>
</el-table-column>
<el-table-column label="申请来源" align="center" prop="pondsrc" />
<el-table-column label="申请单号" align="center" prop="wetusrcode" />
<el-table-column label="来源编号" align="center" prop="srcbllusrcode" />
<el-table-column label="备注" align="center" prop="remark" />
</el-table>
<pagination
v-show="queryPageParams.weightInfo.total>0 && activeTab === 'weightInfo'"
:total="queryPageParams.weightInfo.total"
:page.sync="queryPageParams.weightInfo.pageNum"
:limit.sync="queryPageParams.weightInfo.pageSize"
@pagination="handleQueryPoundList"
/>
</el-col>
<!-- 右下部分：历史皮重 -->
<div style=" width: 500px; display: inline-block;float:left;position: relative;top: -29px;">
<div>
<el-button class="transition-all duration-200" type="primary" size="mini" @click="">历史皮重</el-button>
</div>
<div >
<el-col :span="8">
<el-button type="primary" size="mini" @click="">历史皮重</el-button>
<el-table v-loading="historyPoundLoading"
style="width: 500px;"
:data="historyPoundList"
border
stripe
@selection-change="handleSelectionChange">
@selection-change="handleSelectionChange"
height="500"
>
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="皮重" align="center" prop="emptycarqty" />
<el-table-column label="称重时间" align="center" prop="weighdt" width="180">
@ -340,13 +462,10 @@
</template>
</el-table-column>
</el-table>
</div>
</div>
</div>
</div>
</el-col>
</el-row>
</el-card>
</div>
</div>
</template>
<script>
@ -363,6 +482,7 @@ import { listPoundbill,getNumber as getPoundNumber, getPoundbill, delPoundbill,
import {delUser} from "@/api/system/user";
//导入计算方法
import Decimal from 'decimal.js';
import {mulToString,mulToArray} from "@/api/tool/util.js"
export default {
name: "Outinpound",
components: {SearchSelect},
@ -389,6 +509,8 @@ export default {
poundappliList: [],
// 过皮申请表格
tareappliList: [],
// 磅单信息表格
poundbillList: [],
// 历史皮重表格
historyPoundList: [],
// 弹出层标题
@ -436,7 +558,8 @@ export default {
weightInfo:{
total:0,
pageNum:1,
pageSize:10
pageSize:10,
},
},
}
@ -647,6 +770,9 @@ export default {
this.$message.error("请选择磅点！");
return;
}
//查询前，需要将页数变为1
this.queryPageParams.weighingRequest.pageNum = 1;
this.queryPageParams.tareRequest.pageNum = 1;
this.handleSearchPoundappli();
this.handleSearchTareappli();
if (this.tareappliList.length > 0){
@ -663,7 +789,10 @@ export default {
isinuse:"Y",
bllstate:"1"
};
thisqueryParams.pageNo = this.queryPageParams.weighingRequest.pageNum;
thisqueryParams.params = {};
thisqueryParams.params.oabilltype = mulToArray(this.truepoundData.oabilltype);
debugger;
thisqueryParams.pageNum = this.queryPageParams.weighingRequest.pageNum;
thisqueryParams.pageSize = this.queryPageParams.weighingRequest.pageSize;
thisqueryParams.carno = this.queryParams.carno;
listPoundappli(thisqueryParams).then(response => {
@ -680,7 +809,9 @@ export default {
isinuse:"Y",
billstate:"1"
};
thisqueryParams.pageNo = this.queryPageParams.tareRequest.pageNum;
thisqueryParams.params = {};
thisqueryParams.params.oabilltype = mulToArray(this.truepoundData.oabilltype);
thisqueryParams.pageNum = this.queryPageParams.tareRequest.pageNum;
thisqueryParams.pageSize = this.queryPageParams.tareRequest.pageSize;
thisqueryParams.carno = this.queryParams.carno;
listPoundbill(thisqueryParams).then(response => {
@ -833,6 +964,25 @@ export default {
})
}
}).catch(() => {})
},
//查询磅单点击事件方法
QueryPoundList(){
this.queryPageParams.weightInfo.pageNum = 1;
this.handleQueryPoundList();
},
//查询磅单
handleQueryPoundList(){
this.loading = true;
var thisqueryParams = {
}
thisqueryParams.pageNum = this.queryPageParams.weightInfo.pageNum;
thisqueryParams.pageSize = this.queryPageParams.weightInfo.pageSize;
listPoundbill(thisqueryParams).then(response => {
this.queryPageParams.weightInfo.total = response.total;
this.poundbillList = response.rows;
this.loading = false;
})
}
},
mounted() {