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-15 14:33:34 +08:00
parent 6cf3d4220f
commit cfcfbb57c4
9 changed files with 353 additions and 822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,8 +145,7 @@
</template>
</el-table-column>
<el-table-column label="任务号" align="left" prop="taskNo" />
<!-- <el-table-column :label="$t('inJob.supplierName')" align="left" prop="supplierName" key="supplierId" value="supplierName" /> // 供应商-->
<!-- <el-table-column :label="$t('inJob.departmentName')" align="left" prop="departmentName" /> // 部门-->
<el-table-column label="批号" align="left" prop="lotNo" fixed />
<el-table-column label="托盘码" align="left" prop="trayCode" />
<el-table-column label="货位" align="left" prop="cargoSpaceName" />
<el-table-column label="优先级" align="left" prop="priority" />
@@ -158,21 +157,8 @@
<el-table-column label="入口ID" align="left" prop="entranceId" />
<el-table-column label="仓库" align="left" prop="warehouseName" />
<el-table-column label="创建时间" align="left" prop="createTime" width="180"/>
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>-->
<el-table-column label="开始时间" align="left" prop="startTime" width="180"/>
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>-->
<el-table-column label="结束时间" align="left" prop="finishTime" width="180"/>
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>-->
</el-table>
<pagination
@@ -192,19 +178,17 @@
<el-table-column label="单据ID" align="left" prop="inOrOutId" />
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" />
<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.englishDesc" />
<el-table-column label="箱号" align="left" prop="extraField.cartonNo" />
<el-table-column label="包装方式" align="left" prop="extraField.packingMethod" />
<!-- <el-table-column label="净重" align="right" width="120px" prop="extraField.netWeight" />-->
<!-- <el-table-column label="总净重" align="right" prop="extraField.totalNetWeight" />-->
<!-- <el-table-column label="毛重" align="right" prop="extraField.grossWeight" />-->
<el-table-column label="物料名称" align="left" prop="productName" />
<el-table-column label="规格" align="left" prop="spec"/><!--规格-->
<el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
<el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
<el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
<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-column label="入库数量" align="right" prop="inQuantity" />
<!-- <el-table-column :label="$t('inJob.inDate')" align="left" prop="inDate" width="180"> // 入库时间-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination

17
ruoyi-ui/src/views/in/stockIn/index.vue
View File

@@ -155,14 +155,21 @@
<el-table-column label="子单ID" align="left" prop="stockinDetailId"/><!--子单ID-->
<el-table-column label="主单ID" align="left" prop="stockinId"/><!--主单ID-->
<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.englishDesc"/><!--英文描述-->
<el-table-column label="箱号" align="left" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column label="包装方式" align="left" prop="extraField.packingMethod"/><!--包装方式-->
<!-- <el-table-column :label="$t('inReceiveStockin.netWeight')" align="right" width="120px" prop="extraField.netWeight" /> &lt;!&ndash;净重&ndash;&gt;-->
<el-table-column label="物料名称" align="left" prop="productName"/><!--物料编码-->
<el-table-column label="批号" align="left" prop="lotNo"/><!--批号-->
<el-table-column label="规格" align="left" prop="spec"/><!--规格-->
<el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
<el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
<el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
<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-column label="计划数量" align="right" prop="quantity"/><!--计划数量-->
<el-table-column label="扫码数量" align="right" prop="scanNum"/><!--扫码数量-->
<el-table-column label="实际数量" align="right" prop="assignNum"/><!--实际数量-->
</el-table>
<pagination
v-show="detailTotal>0"