zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

盘点管理页面 页面字段修改

Browse Source
This commit is contained in:
liuhanqing
2026-01-07 15:37:03 +08:00
parent 2c6f0fea94
commit e14aac2fc3
16 changed files with 404 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
View File

@@ -175,7 +175,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService {
checkStockin.setStatus("1"); checkStockin.setStatus("1");
checkStockin.setStockSource("0"); checkStockin.setStockSource("0");
checkStockin.setCheckType(checkStockin.getCheckType()); checkStockin.setCheckType(checkStockin.getCheckType());
//checkStockin.setErpBill(checkStockin.getErpBill()); checkStockin.setErpBill(checkStockin.getErpBill());
if ("1".equals(checkStockin.getCheckType())) { if ("1".equals(checkStockin.getCheckType())) {
//物料盘点 //物料盘点
for (int i = 0; i < detailList.size(); i++) { for (int i = 0; i < detailList.size(); i++) {

12
ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java
View File

@@ -46,6 +46,18 @@ public class ViewProductAndStockController extends BaseController
return getDataTable(list); return getDataTable(list);
} }
/**
* 查询库存物资列表
*/
@PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:list')")
@GetMapping("/pd/list")
public TableDataInfo pdList(ViewProductAndStock viewProductAndStock)
{
startPage();
List<ViewProductAndStock> list = viewProductAndStockService.selectViewProductAndStockPdList(viewProductAndStock);
return getDataTable(list);
}
/** /**
* 导出库存物资列表 * 导出库存物资列表
*/ */

2
ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/mapper/ViewProductAndStockMapper.java
View File

@@ -58,4 +58,6 @@ public interface ViewProductAndStockMapper
* @return 结果 * @return 结果
*/ */
public int deleteViewProductAndStockByOnlyIdentitys(Long[] onlyIdentitys); public int deleteViewProductAndStockByOnlyIdentitys(Long[] onlyIdentitys);
List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock);
} }

9
ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/IViewProductAndStockService.java
View File

@@ -26,6 +26,14 @@ public interface IViewProductAndStockService
* @return 库存物资集合 * @return 库存物资集合
*/ */
public List<ViewProductAndStock> selectViewProductAndStockList(ViewProductAndStock viewProductAndStock); public List<ViewProductAndStock> selectViewProductAndStockList(ViewProductAndStock viewProductAndStock);
/**
* 查询库存物资列表
*
* @param viewProductAndStock 库存物资
* @return 库存物资集合
*/
List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock);
/** /**
* 新增库存物资 * 新增库存物资
@@ -58,4 +66,5 @@ public interface IViewProductAndStockService
* @return 结果 * @return 结果
*/ */
public int deleteViewProductAndStockByOnlyIdentity(Long onlyIdentity); public int deleteViewProductAndStockByOnlyIdentity(Long onlyIdentity);
} }

12
ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/impl/ViewProductAndStockServiceImpl.java
View File

@@ -43,6 +43,18 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
return viewProductAndStockMapper.selectViewProductAndStockList(viewProductAndStock); return viewProductAndStockMapper.selectViewProductAndStockList(viewProductAndStock);
} }
/**
* 查询库存物资列表
*
* @param viewProductAndStock 库存物资
* @return 库存物资
*/
@Override
public List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock) {
return viewProductAndStockMapper.selectViewProductAndStockPdList(viewProductAndStock);
}
/** /**
* 新增库存物资 * 新增库存物资
* *

2
ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.stock.freeze.domain; package com.ruoyi.stock.freeze.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -90,6 +91,7 @@ public class BasStockFreezeRecord extends BaseEntity
private String productGuid; private String productGuid;
// 创建时间 // 创建时间
@Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30) @Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
@Override @Override

3
ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java
View File

@@ -1,9 +1,11 @@
package com.ruoyi.stock.maintain.domain; package com.ruoyi.stock.maintain.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
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 org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
@@ -69,6 +71,7 @@ public class BasStockMaintainRecord extends BaseEntity
private String warehouseId; private String warehouseId;
@Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30) @Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
@Override @Override

1
ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml
View File

@@ -109,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
${params.warehouseDataScope} ${params.warehouseDataScope}
</if> </if>
</where> </where>
order by cs.create_date asc
</select> </select>
<insert id="insertCheckStockinFinish" parameterType="CheckStockinFinish"> <insert id="insertCheckStockinFinish" parameterType="CheckStockinFinish">

1
ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml
View File

@@ -80,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
${params.warehouseDataScope} ${params.warehouseDataScope}
</if> </if>
</where> </where>
order by cs.create_date asc
</select> </select>
<select id="selectCheckStockinByStockGuid" parameterType="String" resultMap="CheckStockinResult"> <select id="selectCheckStockinByStockGuid" parameterType="String" resultMap="CheckStockinResult">

27
ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml
View File

@@ -26,6 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectViewProductAndStockVo"> <sql id="selectViewProductAndStockVo">
select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, voltage, power, phase from view_product_and_stock select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, voltage, power, phase from view_product_and_stock
</sql> </sql>
<sql id="selectViewProductAndStockPdVo">
select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, voltage, power, phase from view_product_and_stock_pd
</sql>
<select id="selectViewProductAndStockList" parameterType="ViewProductAndStock" resultMap="ViewProductAndStockResult"> <select id="selectViewProductAndStockList" parameterType="ViewProductAndStock" resultMap="ViewProductAndStockResult">
<include refid="selectViewProductAndStockVo"/> <include refid="selectViewProductAndStockVo"/>
@@ -53,6 +56,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectViewProductAndStockVo"/> <include refid="selectViewProductAndStockVo"/>
where only_identity = #{onlyIdentity} where only_identity = #{onlyIdentity}
</select> </select>
<select id="selectViewProductAndStockPdList" parameterType="ViewProductAndStock"
resultMap="ViewProductAndStockResult">
<include refid="selectViewProductAndStockPdVo"/>
<where>
<if test="onlyIdentity != null ">and only_identity = #{onlyIdentity}</if>
<if test="productId != null and productId != ''">and product_id = #{productId}</if>
<if test="lotNo != null and lotNo != ''">and lot_no = #{lotNo}</if>
<if test="productName != null and productName != ''">and product_name like concat('%', #{productName},
'%')
</if>
<if test="quantity != null and quantity != ''">and quantity = #{quantity}</if>
<if test="warehouseId != null and warehouseId != ''">and warehouse_id = #{warehouseId}</if>
<if test="stackingId != null and stackingId != ''">and stacking_id = #{stackingId}</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>
<if test="voltage != null and voltage != ''">and voltage = #{voltage}</if>
<if test="power != null and power != ''">and power = #{power}</if>
<if test="phase != null and phase != ''">and phase = #{phase}</if>
</where>
</select>
<insert id="insertViewProductAndStock" parameterType="ViewProductAndStock"> <insert id="insertViewProductAndStock" parameterType="ViewProductAndStock">
insert into view_product_and_stock insert into view_product_and_stock

250
ruoyi-ui/src/views/check/create/index.vue
View File

@@ -2,16 +2,19 @@
<div class="app-container"> <div class="app-container">
<!-- 主表信息录入 --> <!-- 主表信息录入 -->
<el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules"> <el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules">
<!-- <el-form-item label="仓库" prop="warehouseId" required>--> <el-form-item label="仓库" prop="warehouseId" required>
<!-- <el-select v-model="formData.warehouseId" placeholder="请选择仓库" clearable>--> <el-select v-model="formData.warehouseId" placeholder="请选择仓库" clearable>
<!-- <el-option--> <el-option
<!-- v-for="dict in warehouseOptions"--> v-for="dict in warehouseOptions"
<!-- :key="dict.warehouseId"--> :key="dict.warehouseId"
<!-- :label="dict.warehouseName"--> :label="dict.warehouseName"
<!-- :value="dict.warehouseId"--> :value="dict.warehouseId"
<!-- />--> />
<!-- </el-select>--> </el-select>
<!-- </el-form-item>--> </el-form-item>
<el-form-item label="项目号" prop="spare4">
<el-input v-model="formData.spare4" placeholder="请输入项目号"/>
</el-form-item>
<el-form-item label="盘点类型" prop="checkType" required> <el-form-item label="盘点类型" prop="checkType" required>
<el-select v-model="formData.checkType" placeholder="请选择盘点类型" clearable @change="handleCheckTypeChange"> <el-select v-model="formData.checkType" placeholder="请选择盘点类型" clearable @change="handleCheckTypeChange">
<el-option <el-option
@@ -22,6 +25,10 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="spare5">
<el-input v-model="formData.spare5" placeholder="请输入备注"/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">重置</el-button> <el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">重置</el-button>
<el-button type="success" icon="el-icon-check" size="mini" @click="handleSave" <el-button type="success" icon="el-icon-check" size="mini" @click="handleSave"
@@ -32,19 +39,27 @@
<div class="mb8"> <div class="mb8">
<el-button type="primary" icon="el-icon-plus" size="mini" v-hasPermi="['check:productAndStock:list']" <el-button type="primary" icon="el-icon-plus" size="mini" v-hasPermi="['check:productAndStock:list']"
@click="handleSelectMaterials">选择物资 @click="handleSelectMaterials">选择存货
</el-button> </el-button>
<el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">重新建单</el-button> <el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">重新建单</el-button>
</div> </div>
<!-- 物资明细表格 --> <!-- 存货明细表格 -->
<el-table v-loading="loading" :data="materialList"> <el-table v-loading="loading" :data="materialList">
<el-table-column label="物资编号" align="left" prop="productId"/> <el-table-column label="存货编号" align="left" prop="productId"/>
<el-table-column label="品名" align="left" prop="productName"/> <el-table-column label="存货名称" align="left" prop="spare7"/>
<el-table-column label="批号" align="left" prop="lotNo"/> <el-table-column label="批号" align="left" prop="lotNo"/>
<el-table-column label="层级关系" align="right" prop="spare1"/>
<el-table-column label="上层物料" align="right" prop="spare2"/>
<el-table-column label="顶层物料" align="right" prop="spare3"/>
<el-table-column label="项目号" align="right" prop="spare4"/>
<el-table-column label="合同号" align="right" prop="spare5"/>
<el-table-column label="销售订单号" align="right" prop="spare6"/>
<el-table-column label="供应商编码" align="right" prop="supplierId"/>
<el-table-column label="规格型号" align="right" prop="spec"/>
<el-table-column label="计量单位" align="right" prop="unit"/>
<!-- <el-table-column label="货位名称" align="left" prop="cargoSpaceName"/>-->
<el-table-column label="数量" align="right" prop="quantity"/> <el-table-column label="数量" align="right" prop="quantity"/>
<el-table-column label="仓库编号" align="left" prop="warehouseId"/>
<el-table-column label="货位名称" align="left" prop="cargoSpaceName"/>
<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 size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.$index)">删除</el-button> <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.$index)">删除</el-button>
@@ -52,29 +67,61 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 选择物料物资弹窗 --> <!-- 选择物料存货弹窗 -->
<el-dialog title="选择物资" :visible.sync="materialDialogByProduct" width="800px" append-to-body> <el-dialog title="选择存货" :visible.sync="materialDialogByProduct" width="70%" append-to-body>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="品号" prop="productId"> <el-form-item label="存货编码" prop="productId"><!--品号-->
<el-input <el-input
v-model="queryParams.productId" v-model="queryParams.productId"
placeholder="请输入品号" :placeholder="'请输入存货编码'"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="品名" prop="productName"> <el-form-item label="存货名称" prop="productName"><!--品名-->
<el-input <el-input
v-model="queryParams.productName" v-model="queryParams.productName"
placeholder="请输入品名" :placeholder="'请输入存货名称'"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="批号" prop="lotNo"> <el-form-item label="层级关系" prop="spare1"><!--品名-->
<el-input <el-input
v-model="queryParams.lotNo" v-model="queryParams.spare1"
placeholder="请输入批号" :placeholder="'请输入层级关系'"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="上层物料" prop="spare2"><!--品名-->
<el-input
v-model="queryParams.spare2"
:placeholder="'请输入上层物料'"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="顶层物料" prop="spare3"><!--品名-->
<el-input
v-model="queryParams.spare3"
:placeholder="'请输入顶层物料'"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格型号" prop="power"><!--品名-->
<el-input
v-model="queryParams.power"
:placeholder="'请输入规格型号'"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="计量单位" prop="phase"><!--品名-->
<el-input
v-model="queryParams.phase"
:placeholder="'请输入计量单位'"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@@ -99,52 +146,23 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="materialLoading" :data="materialOptions" @selection-change="handleSelectionChange"> <el-table v-loading="materialLoading" :data="materialOptions" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="盘点状态" align="center" prop="spare7"> <el-table-column label="序号" align="center" prop="onlyIdentity" />
<template slot-scope="scope"> <el-table-column label="存货编码" align="center" prop="productId" />
<dict-tag :options="dict.type.check_status" :value="scope.row.spare7"/> <el-table-column label="批号" align="center" prop="lotNo" />
</template> <el-table-column label="存货名称" align="center" prop="productName" />
</el-table-column> <el-table-column label="库存数量" align="center" prop="quantity" />
<el-table-column label="品号" align="center" prop="productId"/> <el-table-column label="仓库编码" align="center" prop="warehouseId" />
<el-table-column label="NC号" align="center" prop="spare9"/> <el-table-column label="供应商名称" align="center" prop="stackingId" />
<el-table-column label="品名" align="center" prop="productName"/> <el-table-column label="层级关系" align="center" prop="spare1" />
<el-table-column label="数量" align="center" prop="quantity"/> <el-table-column label="上层物料" align="center" prop="spare2" />
<el-table-column label="规格" align="center" prop="spec"/> <el-table-column label="顶层物料" align="center" prop="spare3" />
<el-table-column label="品号描述" align="center" prop="price"/> <el-table-column label="项目号" align="center" prop="spare4" />
<el-table-column label="英文描述" align="center" prop="cargoNo"/> <el-table-column label="合同号" align="center" prop="spare5" />
<el-table-column label="图号" align="center" prop="unit"/> <el-table-column label="销售订单号" align="center" prop="spare6" />
<el-table-column label="电压" align="center" prop="spare5"/> <el-table-column label="供应商编码" align="center" prop="voltage" />
<el-table-column label="电源线" align="center" prop="spare10"/> <el-table-column label="规格型号" align="center" prop="power" />
<el-table-column label="插头" align="center" prop="spare11"/> <el-table-column label="计量单位" align="center" prop="phase" />
<el-table-column label="接嘴" align="center" prop="spare12"/>
<el-table-column label="快捷码" align="center" prop="spare13"/>
<el-table-column label="库存单位编号" align="center" prop="spare14"/>
<el-table-column label="库存单位名称" align="center" prop="spare15"/>
<el-table-column label="品号群组" align="center" prop="spare16"/>
<el-table-column label="归类品" align="center" prop="spare17"/>
<el-table-column label="计量体系" align="center" prop="spare18"/>
<el-table-column label="群组名称" align="center" prop="spare19"/>
<el-table-column label="批号管理" align="center" prop="spare20"/>
<el-table-column label="状态" align="center" prop="spare21"/>
<el-table-column label="产品大类" align="center" prop="spare22"/>
<el-table-column label="产品二类" align="center" prop="spare23"/>
<el-table-column label="产品线/产品系列" align="center" prop="spare24"/>
<el-table-column label="BOM状态" align="center" prop="spare25"/>
<el-table-column label="产品定位" align="center" prop="spare26"/>
<el-table-column label="电脑板型号" align="center" prop="spare27"/>
<el-table-column label="非标要求" align="center" prop="spare28"/>
<el-table-column label="品牌" align="center" prop="spare29"/>
<el-table-column label="非标颜色" align="center" prop="spare30"/>
<el-table-column label="主颜色" align="center" prop="spare31"/>
<el-table-column label="辅助颜色" align="center" prop="spare32"/>
<el-table-column label="是否标准款" align="center" prop="spare33"/>
<el-table-column label="包装方式" align="center" prop="spare34"/>
<el-table-column label="主要包装方式" align="center" prop="spare35"/>
<el-table-column label="描述" align="center" prop="remark"/>
<el-table-column label="长" align="center" prop="spare36"/>
<el-table-column label="宽" align="center" prop="spare37"/>
<el-table-column label="高" align="center" prop="spare38"/>
<el-table-column label="包装材积" align="center" prop="spare39"/>
</el-table> </el-table>
<pagination <pagination
@@ -342,30 +360,36 @@ export default {
], ],
checkType: [ checkType: [
{required: true, message: '请选择单据类型', trigger: "change"} {required: true, message: '请选择单据类型', trigger: "change"}
],
spare4: [
{required: true, message: '请输入项目号', trigger: "change"}
] ]
}, },
// 主表数据 // 主表数据
formData: { formData: {
warehouseId: "01", warehouseId: null,
customerNo: null, customerNo: null,
checkType: null checkType: null,
spare5: null,
spare4: null,
erpBill: null,
}, },
// 仓库选项 // 仓库选项
warehouseOptions: [], warehouseOptions: [],
// 物资明细列表 // 存货明细列表
materialList: [], materialList: [],
// 选择物资弹窗 // 选择存货弹窗
materialDialogByProduct: false, materialDialogByProduct: false,
materialDialogByTrayCode: false, materialDialogByTrayCode: false,
// 物资选择列表 // 存货选择列表
materialOptions: [], materialOptions: [],
// 托盘选择列表 // 托盘选择列表
trayOptions: [], trayOptions: [],
// 已选择的物资 // 已选择的存货
selectedMaterials: [], selectedMaterials: [],
// 已选择的托盘 // 已选择的托盘
selectedTrays: [], selectedTrays: [],
// 物资查询参数 // 存货查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
@@ -412,7 +436,7 @@ export default {
this.warehouseOptions = response.rows; this.warehouseOptions = response.rows;
}); });
}, },
/** 打开选择物资弹窗 */ /** 打开选择存货弹窗 */
handleSelectMaterials() { handleSelectMaterials() {
// if (!this.formData.warehouseId) { // if (!this.formData.warehouseId) {
// this.$modal.msgError('请选择仓库'); // this.$modal.msgError('请选择仓库');
@@ -423,18 +447,23 @@ export default {
return; return;
} }
if (this.formData.checkType === '1') { if (this.formData.checkType === '1') {
if (!this.formData.spare4){
this.$modal.msgError('请输入项目号');
return;
}
this.materialDialogByProduct = true; this.materialDialogByProduct = true;
// 设置查询参数中的仓库ID为主表选择的仓库 // 设置查询参数中的仓库ID为主表选择的仓库
this.queryParams.warehouseId = "01"; this.queryParams.warehouseId = this.formData.warehouseId;
this.queryParams.spare4 = this.formData.spare4;
this.getMaterialList(); this.getMaterialList();
} else if (this.formData.checkType === '2') { } else if (this.formData.checkType === '2') {
this.materialDialogByTrayCode = true; this.materialDialogByTrayCode = true;
// 设置查询参数中的仓库ID为主表选择的仓库 // 设置查询参数中的仓库ID为主表选择的仓库
this.queryParams.warehouseId = "01"; this.queryParams.warehouseId = this.formData.warehouseId;
this.getMaterialByTrayCodeList(); this.getMaterialByTrayCodeList();
} }
}, },
/** 获取物资列表 */ /** 获取存货列表 */
getMaterialList() { getMaterialList() {
this.materialLoading = true; this.materialLoading = true;
if (this.formData.checkType === '1') { if (this.formData.checkType === '1') {
@@ -445,7 +474,7 @@ export default {
}); });
} }
}, },
/* 获取托盘物资列表*/ /* 获取托盘存货列表*/
getMaterialByTrayCodeList() { getMaterialByTrayCodeList() {
this.trayLoading = true; this.trayLoading = true;
if (this.formData.checkType === '2') { if (this.formData.checkType === '2') {
@@ -460,7 +489,7 @@ export default {
}); });
} }
}, },
/** 物资选择变更 */ /** 存货选择变更 */
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.selectedMaterials = selection; this.selectedMaterials = selection;
}, },
@@ -483,7 +512,7 @@ export default {
}); });
} }
}, },
/** 确认选择物资 */ /** 确认选择存货 */
confirmSelectMaterials() { confirmSelectMaterials() {
if (this.formData.checkType === '1') { if (this.formData.checkType === '1') {
this.confirmSelectMaterialsByProduct(); this.confirmSelectMaterialsByProduct();
@@ -491,19 +520,19 @@ export default {
this.confirmSelectMaterialsByTray(); this.confirmSelectMaterialsByTray();
} }
}, },
/** 确认选择物料物资 */ /** 确认选择物料存货 */
confirmSelectMaterialsByProduct() { confirmSelectMaterialsByProduct() {
if (this.selectedMaterials.length === 0) { if (this.selectedMaterials.length === 0) {
this.$modal.msgError('请选择物资'); this.$modal.msgError('请选择存货');
return; return;
} }
// 过滤掉已经存在的物资 // 过滤掉已经存在的存货
const newMaterials = this.selectedMaterials.filter(item => { const newMaterials = this.selectedMaterials.filter(item => {
return !this.materialList.some(existing => existing.onlyIdentity === item.onlyIdentity); return !this.materialList.some(existing => existing.onlyIdentity === item.onlyIdentity);
}); });
if (newMaterials.length === 0) { if (newMaterials.length === 0) {
this.$modal.msgWarning('选择的物资已存在'); this.$modal.msgWarning('选择的存货已存在');
return; return;
} }
@@ -511,32 +540,29 @@ export default {
newMaterials.map(item => ({ newMaterials.map(item => ({
productId: item.productId, productId: item.productId,
productGuId: item.productGuid, productGuId: item.productGuid,
productName: item.productName, spare7: item.productName,
quantity: item.quantity, quantity: item.quantity,
lotNo: item.lotNo, lotNo: item.lotNo,
onlyIdentity: item.onlyIdentity, onlyIdentity: item.onlyIdentity,
warehouseId: item.warehouseId, warehouseId: item.warehouseId,
cargoSpaceId: item.cargoSpaceId, cargoSpaceId: item.cargoSpaceId,
cargoSpaceName: item.cargoSpaceName, cargoSpaceName: item.cargoSpaceName,
spec: item.spare1, spare1: item.spare1,
// spare3: item.spare3, spare2: item.spare2,
spare1: item.spare4, spare3: item.spare3,
spare3: item.spare5, spare4: item.spare4,
spare4: item.spare6, spare5: item.spare5,
spare5: item.voltage, spare6: item.spare6,
spare6: item.power, spec: item.power,
spare7: item.phase, unit: item.phase,
spare2: item.netWeight, supplierId: item.stackingId,
spare8: item.grossWeight,
spare9: item.distribution,
unit: item.model,
orderId: item.orderId
})) }))
); );
this.materialDialogByProduct = false; this.materialDialogByProduct = false;
this.selectedMaterials = []; this.selectedMaterials = [];
}, },
/** 确认选择托盘物资 */ /** 确认选择托盘存货 */
confirmSelectMaterialsByTray() { confirmSelectMaterialsByTray() {
if (this.selectedTrays.length === 0) { if (this.selectedTrays.length === 0) {
this.$modal.msgError('请选择托盘'); this.$modal.msgError('请选择托盘');
@@ -580,7 +606,7 @@ export default {
this.materialDialogByTrayCode = false; this.materialDialogByTrayCode = false;
this.selectedTrays = []; this.selectedTrays = [];
}, },
/** 取消选择物资 */ /** 取消选择存货 */
cancelSelectMaterials() { cancelSelectMaterials() {
if (this.formData.checkType === '1') { if (this.formData.checkType === '1') {
this.cancelSelectMaterialsByProduct(); this.cancelSelectMaterialsByProduct();
@@ -588,22 +614,22 @@ export default {
this.cancelSelectMaterialsByTray(); this.cancelSelectMaterialsByTray();
} }
}, },
/** 取消选择物料物资 */ /** 取消选择物料存货 */
cancelSelectMaterialsByProduct() { cancelSelectMaterialsByProduct() {
this.selectedMaterials = []; this.selectedMaterials = [];
this.materialDialogByProduct = false; this.materialDialogByProduct = false;
}, },
/** 取消选择托盘物资 */ /** 取消选择托盘存货 */
cancelSelectMaterialsByTray() { cancelSelectMaterialsByTray() {
this.selectedTrays = []; this.selectedTrays = [];
this.materialDialogByTrayCode = false; this.materialDialogByTrayCode = false;
}, },
/** 物资搜索按钮操作 */ /** 存货搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getMaterialList(); this.getMaterialList();
}, },
/** 物资重置按钮操作 */ /** 存货重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
@@ -625,7 +651,7 @@ export default {
this.handleQuery(); this.handleQuery();
}) })
}, },
/** 删除物资 */ /** 删除存货 */
handleDelete(index) { handleDelete(index) {
this.materialList.splice(index, 1); this.materialList.splice(index, 1);
}, },
@@ -634,7 +660,7 @@ export default {
this.$refs.formRef.validate(valid => { this.$refs.formRef.validate(valid => {
if (valid) { if (valid) {
if (this.materialList.length === 0) { if (this.materialList.length === 0) {
this.$modal.msgError('请选择物资'); this.$modal.msgError('请选择存货');
return; return;
} }
const data = { const data = {
@@ -655,7 +681,7 @@ export default {
/** 单据类型变更处理 */ /** 单据类型变更处理 */
handleCheckTypeChange(value) { handleCheckTypeChange(value) {
if (this.materialList.length > 0) { if (this.materialList.length > 0) {
this.$modal.msgWarning('已添加物资，不能更改单据类型'); this.$modal.msgWarning('已添加存货，不能更改单据类型');
this.$nextTick(() => { this.$nextTick(() => {
this.formData.checkType = this.oldCheckType; this.formData.checkType = this.oldCheckType;
}); });

9
ruoyi-ui/src/views/check/difference/index.vue
View File

@@ -33,10 +33,10 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="品号" prop="productId"> <el-form-item label="存货编码" prop="productId">
<el-input <el-input
v-model="queryParams.productId" v-model="queryParams.productId"
placeholder="请输入品号" placeholder="请输入存货编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@@ -115,9 +115,8 @@
<el-table-column label="库存编号" align="left" prop="stockId" /> <el-table-column label="库存编号" align="left" prop="stockId" />
<el-table-column label="托盘编码" align="left" prop="trayCode" /> <el-table-column label="托盘编码" align="left" prop="trayCode" />
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" /> <el-table-column label="货位名称" align="left" prop="cargoSpaceName" />
<el-table-column label="品号" align="left" prop="productId" /> <el-table-column label="存货编码" align="left" prop="productId" />
<el-table-column label="品名" align="left" prop="extraField.materialDesc"/> <el-table-column label="存货名称" align="left" prop="extraField.materialDesc"/>
<el-table-column label="英文描述" align="left" prop="extraField.englishDesc"/>
<el-table-column label="原值" align="right" prop="oldQuantity" /> <el-table-column label="原值" align="right" prop="oldQuantity" />
<el-table-column label="新值" align="right" prop="newQuantity" /> <el-table-column label="新值" align="right" prop="newQuantity" />
<el-table-column label="操作方式" align="left" prop="recordType" > <el-table-column label="操作方式" align="left" prop="recordType" >

128
ruoyi-ui/src/views/check/job/in/index.vue
View File

@@ -1,15 +1,21 @@
<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="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="任务ID" prop="jobId"> <el-form-item label="仓库" prop="warehouseId"> <!-- 仓库 -->
<el-input <el-select
v-model="queryParams.jobId" v-model="queryParams.warehouseId"
placeholder="请输入任务ID" placeholder="请选择仓库"
clearable clearable
@keyup.enter.native="handleQuery" >
/> <el-option
</el-form-item>--> v-for="dict in warehouseOptions"
<el-form-item label="任务状态" prop="status"> :key="dict.warehouseId"
:label="dict.warehouseName"
:value="dict.warehouseId"
/>
</el-select>
</el-form-item>
<el-form-item label="任务状态" prop="status"> <!-- 状态 -->
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable> <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-option <el-option
v-for="dict in dict.type.mydo_job_status" v-for="dict in dict.type.mydo_job_status"
@@ -19,7 +25,18 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="任务号" prop="taskNo"> <el-form-item label="作业类型" prop="inOrOut"> <!-- 作业类型 -->
<el-select v-model="queryParams.inOrOut" placeholder="请选择作业类型" clearable>
<el-option
v-for="dict in dict.type.out_job_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="任务号" prop="taskNo"> <!-- 任务号 -->
<el-input <el-input
v-model="queryParams.taskNo" v-model="queryParams.taskNo"
placeholder="请输入任务号" placeholder="请输入任务号"
@@ -27,36 +44,37 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</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"
/> />
</el-form-item> </el-form-item>
<el-form-item label="订单号" prop="lineId"> <el-form-item label="存货编码" prop="productId">
<el-input <el-input
v-model="queryParams.lineId" v-model="queryParams.productId"
placeholder="请输入订单号" placeholder="请输入存货编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="开始时间" prop="startTime"> <el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.startTime" v-model="queryParams.startTime"
type="datetime" style="width: 206px" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间"> placeholder="请选择开始时间" style="width: 206px">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.finishTime" v-model="queryParams.finishTime"
type="datetime" style="width: 206px" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择结束时间"> placeholder="请选择结束时间" style="width: 206px">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@@ -94,40 +112,25 @@
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow" <el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow"
max-height="400"> max-height="400">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务ID" align="left" prop="jobId" width="160"/> <el-table-column label="任务ID" align="left" prop="jobId" width="160"/> <!-- 任务ID -->
<el-table-column label="任务状态" align="left" prop="status"> <el-table-column label="任务状态" align="left" prop="status"> <!-- 任务状态 -->
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/> <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="上线类型" align="left" prop="onLineType"> <el-table-column label="任务类型" align="left" prop="inOrOut"> <!-- 任务类型 -->
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/> <dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>-->
<el-table-column label="任务号" align="left" prop="taskNo" />
<el-table-column label="任务类型" align="left" prop="inOrOut">
<template slot-scope="scope">
<dict-tag :options="dict.type.check_in_job_type" :value="scope.row.inOrOut"/>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="供应商" align="left" prop="supplierName" key="supplierId" value="supplierName" />--> <el-table-column label="任务号" align="left" prop="taskNo" /> <!-- 任务号 -->
<!-- <el-table-column label="部门" align="left" prop="departmentName" />--> <el-table-column label="托盘码" align="left" prop="trayCode" width="130" />
<el-table-column label="序列号" align="left" prop="trayCode" /> <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="130"/> <!-- 货位ID -->
<el-table-column label="货位" align="left" prop="cargoSpaceName" width="160"/> <el-table-column label="项目号" align="left" prop="lineId" width="130"/> <!-- 结束时间 -->
<el-table-column label="订单号" align="left" prop="lineId" /> <el-table-column label="出口" align="left" prop="exitId"/> <!-- 出口ID -->
<el-table-column label="入口" align="left" prop="entranceId" /> <el-table-column label="创建时间" align="left" prop="createTime" width="180" sortable/> <!-- 创建时间 -->
<el-table-column label="开始时间" align="left" prop="startTime" width="180" sortable/> <!-- 开始时间 -->
<!-- <el-table-column label="优先级" align="right" prop="priority" />--> <el-table-column label="结束时间" align="left" prop="finishTime" width="180" sortable/> <!-- 结束时间 -->
<!-- <el-table-column label="执行阶段" align="left" prop="executionPhase">
<template slot-scope="scope">
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
</template>
</el-table-column>-->
<el-table-column label="创建时间" align="left" prop="createTime" width="160"/>
<el-table-column label="开始时间" align="left" prop="startTime" width="160"/>
<el-table-column label="结束时间" align="left" prop="finishTime" width="160"/>
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" />-->
</el-table> </el-table>
<pagination <pagination
@@ -141,25 +144,20 @@
<el-table v-loading="detailLoading" :data="mydoJobDetailList" @selection-change="handleSelectionChange" <el-table v-loading="detailLoading" :data="mydoJobDetailList" @selection-change="handleSelectionChange"
max-height="300" max-height="300"
> >
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" /> <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" />
<el-table-column label="任务ID" align="left" prop="jobId" width="160"/> <el-table-column label="库存ID" align="left" prop="stockId" width="160" />
<el-table-column label="单据ID" align="left" prop="inOrOutId" width="160"/> <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160"/> <el-table-column label="存货编码" align="left" prop="productId" />
<el-table-column label="品号" align="left" prop="productId" /> <el-table-column label="存货名称" align="left" prop="productName" />
<el-table-column label="品名" align="left" prop="productName" width="160"/> <el-table-column label="批次号" align="left" prop="lotNo" />
<el-table-column label="入库数量" align="right" prop="inQuantity" /> <el-table-column label="客商名称" align="left" prop="stackingId"/>
<el-table-column label="机型" align="left" prop="unit"/><!--机型--> <el-table-column label="层级关系" align="left" prop="spare1"/>
<el-table-column label="分销" align="left" prop="spare9"/><!--分销--> <el-table-column label="上层物料" align="left" prop="spare2"/>
<el-table-column label="规格" align="left" prop="spec"/><!--规格--> <el-table-column label="顶层物料" align="left" prop="spare3"/>
<el-table-column label="型号" align="left" prop="spare1"/><!--型号--> <el-table-column label="项目号" align="left" prop="spare4"/>
<el-table-column label="净重" align="left" prop="spare2"/><!--净重--> <el-table-column label="合同号" align="left" prop="spare5"/>
<el-table-column label="颜色" align="left" prop="spare3"/><!--颜色--> <el-table-column label="销售订单" align="left" prop="spare6"/>
<el-table-column label="序列号" align="left" prop="spare4"/><!--序列号--> <el-table-column label="出库数量" align="right" prop="outQuantity" />
<el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
<el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
<el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
<el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
</el-table> </el-table>
<pagination <pagination

128
ruoyi-ui/src/views/check/job/out/index.vue
View File

@@ -1,15 +1,21 @@
<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="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="任务ID" prop="jobId"> <el-form-item label="仓库" prop="warehouseId"> <!-- 仓库 -->
<el-input <el-select
v-model="queryParams.jobId" v-model="queryParams.warehouseId"
placeholder="请输入任务ID" placeholder="请选择仓库"
clearable clearable
@keyup.enter.native="handleQuery" >
/> <el-option
</el-form-item>--> v-for="dict in warehouseOptions"
<el-form-item label="任务状态" prop="status"> :key="dict.warehouseId"
:label="dict.warehouseName"
:value="dict.warehouseId"
/>
</el-select>
</el-form-item>
<el-form-item label="任务状态" prop="status"> <!-- 状态 -->
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable> <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-option <el-option
v-for="dict in dict.type.mydo_job_status" v-for="dict in dict.type.mydo_job_status"
@@ -19,7 +25,18 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="任务号" prop="taskNo"> <el-form-item label="作业类型" prop="inOrOut"> <!-- 作业类型 -->
<el-select v-model="queryParams.inOrOut" placeholder="请选择作业类型" clearable>
<el-option
v-for="dict in dict.type.out_job_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="任务号" prop="taskNo"> <!-- 任务号 -->
<el-input <el-input
v-model="queryParams.taskNo" v-model="queryParams.taskNo"
placeholder="请输入任务号" placeholder="请输入任务号"
@@ -27,36 +44,37 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</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"
/> />
</el-form-item> </el-form-item>
<el-form-item label="订单号" prop="lineId"> <el-form-item label="存货编码" prop="productId">
<el-input <el-input
v-model="queryParams.lineId" v-model="queryParams.productId"
placeholder="请输入订单号" placeholder="请输入存货编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="开始时间" prop="startTime"> <el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.startTime" v-model="queryParams.startTime"
type="datetime" style="width: 206px" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间"> placeholder="请选择开始时间" style="width: 206px">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.finishTime" v-model="queryParams.finishTime"
type="datetime" style="width: 206px" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择结束时间"> placeholder="请选择结束时间" style="width: 206px">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@@ -92,36 +110,25 @@
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" <el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange"
@row-click="handleRowClick" max-height="400"> @row-click="handleRowClick" max-height="400">
<el-table-column type="selection" width="55" align="center"/> <el-table-column label="任务ID" align="left" prop="jobId" width="160"/> <!-- 任务ID -->
<el-table-column label="任务ID" align="left" prop="jobId"/> <el-table-column label="任务状态" align="left" prop="status"> <!-- 任务状态 -->
<el-table-column label="任务状态" align="left" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/> <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="任务类型" align="left" prop="inOrOut"> <!-- 任务类型 -->
<el-table-column label="任务号" align="left" prop="taskNo"/>
<el-table-column label="任务类型" align="left" prop="inOrOut">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.check_out_job_type" :value="scope.row.inOrOut"/> <dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="部门" align="left" prop="departmentName" />--> <el-table-column label="任务号" align="left" prop="taskNo" /> <!-- 任务号 -->
<el-table-column label="序列号" align="left" prop="trayCode"/> <el-table-column label="托盘码" align="left" prop="trayCode" width="130" />
<el-table-column label="货位" align="left" prop="cargoSpaceName"/> <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="130"/> <!-- 货位ID -->
<el-table-column label="订单号" align="right" prop="lineId"/> <el-table-column label="项目号" align="left" prop="lineId" width="130"/> <!-- 结束时间 -->
<!-- <el-table-column label="执行阶段" align="left" prop="executionPhase"> <el-table-column label="出口" align="left" prop="exitId"/> <!-- 出口ID -->
<template slot-scope="scope"> <el-table-column label="创建时间" align="left" prop="createTime" width="180" sortable/> <!-- 创建时间 -->
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/> <el-table-column label="开始时间" align="left" prop="startTime" width="180" sortable/> <!-- 开始时间 -->
</template> <el-table-column label="结束时间" align="left" prop="finishTime" width="180" sortable/> <!-- 结束时间 -->
</el-table-column>-->
<el-table-column label="出口" align="left" prop="exitId"/>
<el-table-column label="创建时间" align="left" prop="createTime" width="180">
</el-table-column>
<el-table-column label="开始时间" align="left" prop="startTime" width="180"/>
<el-table-column label="结束时间" align="left" prop="finishTime" width="180"/>
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" />-->
</el-table> </el-table>
@@ -134,25 +141,20 @@
/> />
<el-table v-loading="loading" :data="mydoJobDetailList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
<el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160"/> <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" />
<el-table-column label="任务ID" align="left" prop="jobId" width="160"/> <el-table-column label="库存ID" align="left" prop="stockId" width="160" />
<el-table-column label="单据ID" align="left" prop="inOrOutId" width="160"/> <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160"/> <el-table-column label="存货编码" align="left" prop="productId" />
<el-table-column label="库存ID" align="left" prop="stockId" width="160"/> <el-table-column label="存货名称" align="left" prop="productName" />
<el-table-column label="品号" align="left" prop="productId"/> <el-table-column label="批次号" align="left" prop="lotNo" />
<el-table-column label="品名" align="left" prop="productName" width="160"/> <el-table-column label="客商名称" align="left" prop="stackingId"/>
<el-table-column label="出库数量" align="right" prop="outQuantity"/> <!-- 出库数量 --> <el-table-column label="层级关系" align="left" prop="spare1"/>
<el-table-column label="机型" align="left" prop="unit"/><!--机型--> <el-table-column label="上层物料" align="left" prop="spare2"/>
<el-table-column label="分销" align="left" prop="spare9"/><!--分销--> <el-table-column label="顶层物料" align="left" prop="spare3"/>
<el-table-column label="规格" align="left" prop="spec"/><!--规格--> <el-table-column label="项目号" align="left" prop="spare4"/>
<el-table-column label="型号" align="left" prop="spare1"/><!--型号--> <el-table-column label="合同号" align="left" prop="spare5"/>
<el-table-column label="净重" align="left" prop="spare2"/><!--净重--> <el-table-column label="销售订单" align="left" prop="spare6"/>
<el-table-column label="颜色" align="left" prop="spare3"/><!--颜色--> <el-table-column label="出库数量" align="right" prop="outQuantity" />
<el-table-column label="序列号" align="left" prop="spare4"/><!--序列号-->
<el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
<el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
<el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
<el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
</el-table> </el-table>
<pagination <pagination

39
ruoyi-ui/src/views/check/stockCheck/index.vue
View File

@@ -55,7 +55,7 @@
:disabled="single" :disabled="single"
@click="handleReview" @click="handleReview"
v-hasPermi="['check:stockCheck:edit']" v-hasPermi="['check:stockCheck:edit']"
>审核</el-button> >审核单据</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@@ -77,7 +77,7 @@
:disabled="single" :disabled="single"
@click="handleConfirmation" @click="handleConfirmation"
v-hasPermi="['check:stockCheck:edit']" v-hasPermi="['check:stockCheck:edit']"
>确认</el-button> >确认单据</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@@ -88,7 +88,7 @@
:disabled="multiple" :disabled="multiple"
@click="handleInvalidated" @click="handleInvalidated"
v-hasPermi="['check:stockCheck:edit']" v-hasPermi="['check:stockCheck:edit']"
>作废</el-button> >作废单据</el-button>
</el-col> </el-col>
@@ -109,12 +109,14 @@
<dict-tag :options="dict.type.check_bill_status" :value="scope.row.status"/> <dict-tag :options="dict.type.check_bill_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" />--> <el-table-column label="项目号" align="left" prop="spare4" />
<el-table-column label="部门" align="left" prop="departmentName" /> <el-table-column label="仓库" align="left" prop="warehouseName" />
<!-- <el-table-column label="部门" align="left" prop="departmentName" />-->
<el-table-column label="创建人" align="left" prop="createManId" /> <el-table-column label="创建人" align="left" prop="createManId" />
<!-- <el-table-column label="盘点位置" align="left" prop="spare1" />--> <!-- <el-table-column label="盘点位置" align="left" prop="spare1" />-->
<el-table-column label="创建时间" align="left" prop="createDate" /> <el-table-column label="创建时间" align="left" prop="createDate" />
<el-table-column label="完成时间" align="left" prop="finishDate" /> <el-table-column label="完成时间" align="left" prop="finishDate" />
<el-table-column label="备注" align="left" prop="spare5" />
</el-table> </el-table>
<pagination <pagination
@@ -128,21 +130,18 @@
<el-table v-loading="detailLoading" :data="stockCheckDetailList" @selection-change="handleDetailSelectionChange"> <el-table v-loading="detailLoading" :data="stockCheckDetailList" @selection-change="handleDetailSelectionChange">
<el-table-column label="子单ID" align="left" prop="stockCheckDetailId" width="160" /> <el-table-column label="子单ID" align="left" prop="stockCheckDetailId" width="160" />
<el-table-column label="主单ID" align="left" prop="stockCheckId" width="160" /> <el-table-column label="主单ID" align="left" prop="stockCheckId" width="160" />
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="160"/> <!-- <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="160"/>-->
<el-table-column label="品号" align="left" prop="productId"/><!--品号--> <el-table-column label="存货编码" align="left" prop="productId" width="160"/>
<el-table-column label="品名" align="left" prop="productName" width="160"/><!--品号--> <el-table-column label="存货名称" align="left" prop="spare7" width="160"/>
<el-table-column label="批号" align="left" prop="lotNo"/><!--批号--> <el-table-column label="批号" align="left" prop="lotNo"/>
<el-table-column label="机型" align="left" prop="unit"/><!--机型--> <el-table-column label="计量单位" align="left" prop="unit"/>
<el-table-column label="分销" align="left" prop="spare9"/><!--分销--> <el-table-column label="规格型号" align="left" prop="spec"/>
<el-table-column label="规格" align="left" prop="spec"/><!--规格--> <el-table-column label="层级关系" align="left" prop="spare1"/>
<el-table-column label="型号" align="left" prop="spare1"/><!--型号--> <el-table-column label="上层物料" align="left" prop="spare2"/>
<el-table-column label="净重" align="left" prop="spare2"/><!--净重--> <el-table-column label="顶层物料" align="left" prop="spare3"/>
<el-table-column label="颜色" align="left" prop="spare3"/><!--颜色--> <el-table-column label="项目号" align="left" prop="spare4"/>
<el-table-column label="序列号" align="left" prop="spare4"/><!--序列号--> <el-table-column label="合同号" align="left" prop="spare5"/>
<el-table-column label="电压" align="left" prop="spare5"/><!--电压--> <el-table-column label="销售订单" align="left" prop="spare6"/>
<el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
<el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
<el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
<el-table-column label="计划数量" align="right" prop="quantity"/> <el-table-column label="计划数量" align="right" prop="quantity"/>
<el-table-column label="扫码数量" align="right" prop="scanNum"/> <el-table-column label="扫码数量" align="right" prop="scanNum"/>
<el-table-column label="实际数量" align="right" prop="assignNum"/> <el-table-column label="实际数量" align="right" prop="assignNum"/>

34
ruoyi-ui/src/views/stock/management/index.vue
View File

@@ -46,10 +46,10 @@
</el-form-item>--> </el-form-item>-->
<el-form-item label="品名" prop="productName"><!-- 品名 --> <el-form-item label="存货名称" prop="productName"><!-- 存货名称 -->
<el-input <el-input
v-model="queryParams.productName" v-model="queryParams.productName"
placeholder="请输入品名" placeholder="请输入存货名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@@ -107,10 +107,10 @@
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/> <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="品号" align="center" prop="productId" /> <el-table-column label="存货编码" align="center" prop="productId" />
<el-table-column label="品名" align="center" prop="productName" width="160"/> <el-table-column label="存货名称" align="center" prop="productName" width="160"/>
<el-table-column label="批次号" align="center" prop="lotNo" sortable width="160"/> <el-table-column label="批次号" align="center" prop="lotNo" width="160"/>
<el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/> <!-- <el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>-->
<el-table-column label="入库时间" align="center" prop="inDate" width="160" sortable/> <el-table-column label="入库时间" align="center" prop="inDate" width="160" sortable/>
<el-table-column label="数量" align="center" prop="quantity" sortable/> <el-table-column label="数量" align="center" prop="quantity" sortable/>
<el-table-column label="作业编码" align="center" prop="jobId" width="160" sortable/> <el-table-column label="作业编码" align="center" prop="jobId" width="160" sortable/>
@@ -119,18 +119,16 @@
<el-table-column label="入库单号" align="center" prop="stockinId" width="160" sortable/> <el-table-column label="入库单号" align="center" prop="stockinId" width="160" sortable/>
<!-- <el-table-column label="入库类型" align="center" prop="inType" />--> <!-- <el-table-column label="入库类型" align="center" prop="inType" />-->
<!-- <el-table-column label="仓库编码" align="center" prop="warehouseId" />--> <!-- <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
<el-table-column label="规格" align="center" prop="spare1" /> <el-table-column label="层级关系" align="center" prop="spare1" />
<el-table-column label="单位" align="center" prop="spare3" /> <el-table-column label="层级关系" align="center" prop="spare2" />
<el-table-column label="型号" align="center" prop="spare4" /> <el-table-column label="顶层物料" align="center" prop="spare3" />
<el-table-column label="颜色" align="center" prop="spare5" /> <el-table-column label="项目号" align="center" prop="spare4" />
<el-table-column label="序列号" align="center" prop="spare6" /> <el-table-column label="合同号" align="center" prop="spare5" />
<el-table-column label="电压" align="center" prop="voltage" /> <el-table-column label="销售订单" align="center" prop="spare6" />
<el-table-column label="功率" align="center" prop="power" /> <el-table-column label="供应商编码" align="center" prop="voltage" />
<el-table-column label="相位" align="center" prop="phase" /> <el-table-column label="规格型号" align="center" prop="power" />
<el-table-column label="净重" align="center" prop="netWeight" /> <el-table-column label="计量单位" align="center" prop="phase" />
<el-table-column label="毛重" align="center" prop="grossWeight" /> <!-- <el-table-column label="净重" align="center" prop="netWeight" />-->
<el-table-column label="分销" align="center" prop="distribution" />
<el-table-column label="机型" align="center" prop="model" />
<el-table-column width=120 label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 --> <el-table-column width=120 label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button