huojin
/
ZW_MultiSelect
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
liyang 2024-04-12 16:42:47 +08:00
parent 4bb01d4a9c
commit a66675efaf
13 changed files with 412 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
wms-vue/src/components/duochaxun/Jianhuojiemian.vue
View File

@ -242,18 +242,18 @@
<span style="margin-left: 10px">{{ scope.row.id }}</span>
</template>
</el-table-column>
<el-table-column
label="ID"
width="180">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.id}}</span>
</div>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- label="ID"-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <div slot="reference" class="name-wrapper">-->
<!-- <span>{{ scope.row.id}}</span>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
label="工单号"
width="180">
width="120">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.pt_code }}</span>
@ -262,16 +262,16 @@
</el-table-column>
<el-table-column
label="需求日期"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.ORDER_DATE }}</span>
<span>{{ new Date(scope.row.ORDER_DATE).toISOString().replace('T','').substring(0,10)}}</span>
</div>
</template>
</el-table-column>
<el-table-column
label="工作站"
width="180">
width="50">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.END_REGION }}</span>
@ -280,7 +280,7 @@
</el-table-column>
<el-table-column
label="分拨墙"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.s_name }}</span>
@ -289,7 +289,7 @@
</el-table-column>
<el-table-column
label="库区"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.z_name }}</span>
@ -298,7 +298,7 @@
</el-table-column>
<el-table-column
label="SAP类型"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.sourceType }}</span>
@ -307,7 +307,7 @@
</el-table-column>
<el-table-column
label="单据类型"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.bt_name }}</span>
@ -316,7 +316,7 @@
</el-table-column>
<el-table-column
label="子任务号"
width="180">
width="130">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.BILLCODE}}</span>
@ -324,6 +324,7 @@
</template>
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
label="描述"
width="180">
<template slot-scope="scope">
@ -334,7 +335,7 @@
</el-table-column>
<el-table-column
label="料号"
width="180">
width="140">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.i_code }}</span>
@ -343,7 +344,7 @@
</el-table-column>
<el-table-column
label="单位"
width="180">
width="60">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.UNIT }}</span>
@ -352,7 +353,7 @@
</el-table-column>
<el-table-column
label="价值等级"
width="180">
width="50">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.SHIP_RULES }}</span>
@ -361,7 +362,7 @@
</el-table-column>
<el-table-column
label="源库位"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.lc1_code }}</span>
@ -370,7 +371,7 @@
</el-table-column>
<el-table-column
label="容器"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.LP }}</span>
@ -379,7 +380,7 @@
</el-table-column>
<el-table-column
label="目标容器"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.lc2_code }}</span>
@ -388,7 +389,7 @@
</el-table-column>
<el-table-column
label="合单位置"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.strBill4 }}</span>
@ -397,7 +398,7 @@
</el-table-column>
<el-table-column
label="下发数量"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.yc_qty }}</span>
@ -406,7 +407,7 @@
</el-table-column>
<el-table-column
label="分配数量"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PLAN_QUANTITY_MU }}</span>
@ -415,7 +416,7 @@
</el-table-column>
<el-table-column
label="拣货数量"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.MOVED_QUANTITY_MU }}</span>
@ -424,7 +425,7 @@
</el-table-column>
<el-table-column
label="状态"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.Status }}</span>
@ -433,7 +434,7 @@
</el-table-column>
<el-table-column
label="批次号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C1 }}</span>
@ -442,7 +443,7 @@
</el-table-column>
<el-table-column
label="LOC"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C2 }}</span>
@ -451,7 +452,7 @@
</el-table-column>
<el-table-column
label="特殊标记"
width="180">
width="60">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C3 }}</span>
@ -460,7 +461,7 @@
</el-table-column>
<el-table-column
label="供应商编号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C5}}</span>
@ -469,7 +470,7 @@
</el-table-column>
<el-table-column
label="申请编号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C6 }}</span>
@ -478,7 +479,7 @@
</el-table-column>
<el-table-column
label="申请人"
width="180">
width="60">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C7}}</span>
@ -487,7 +488,7 @@
</el-table-column>
<el-table-column
label="暂存原因"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C8 }}</span>
@ -495,7 +496,7 @@
</template>
</el-table-column><el-table-column
label="工厂"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C9}}</span>
@ -504,7 +505,7 @@
</el-table-column>
<el-table-column
label="加急标记"
width="180">
width="60">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.equated_Quantity }}</span>
@ -512,7 +513,7 @@
</template>
</el-table-column><el-table-column
label="序列号"
width="180">
width="120">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.BAR_CODE }}</span>
@ -521,7 +522,7 @@
</el-table-column>
<el-table-column
label="单号状态"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.INVENTORY_STATUS}}</span>
@ -530,7 +531,7 @@
</el-table-column>
<el-table-column
label="项号"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.LINE_NUMBER}}</span>
@ -539,7 +540,7 @@
</el-table-column>
<el-table-column
label="指定拣货人"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.w1_name }}</span>
@ -548,7 +549,7 @@
</el-table-column>
<el-table-column
label="实际拣货人"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.w4_name }}</span>
@ -556,29 +557,38 @@
</template>
</el-table-column>
<el-table-column
label="操作员"
width="180">
label="操作日期"
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.OPERATE_TIME }}</span>
<span>{{new Date(scope.row.OPERATE_TIME).toISOString().replace('T','').substring(0,10) }}</span>
</div>
</template>
</el-table-column>
<el-table-column
label="操作时间"
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ new Date(scope.row.OPERATE_TIME).toISOString().replace('T','').substring(10,18) }}</span>
</div>
</template>
</el-table-column>
<el-table-column
label="分配日期"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.CREATE_TIME }}</span>
<span>{{new Date(scope.row.CREATE_TIME).toISOString().replace('T','').substring(0,10) }}</span>
</div>
</template>
</el-table-column>
<el-table-column
label="分配时间"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.CREATE_TIME }}</span>
<span>{{ new Date(scope.row.CREATE_TIME).toISOString().replace('T','').substring(10,18) }}</span>
</div>
</template>
</el-table-column>
@ -591,32 +601,32 @@
</div>
</template>
</el-table-column>
<el-table-column
label="SAP状态 "
width="180">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.statusCode }}</span>
</div>
</template>
</el-table-column>
<el-table-column
label="AGV状态"
width="180">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.agv_Status }}</span>
</div>
</template>
</el-table-column> <el-table-column
label="sap扣料"
width="180">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.popular}}</span>
</div>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- label="SAP状态 "-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <div slot="reference" class="name-wrapper">-->
<!-- <span>{{ scope.row.statusCode }}</span>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="AGV状态"-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <div slot="reference" class="name-wrapper">-->
<!-- <span>{{ scope.row.agv_Status }}</span>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column> <el-table-column-->
<!-- label="sap扣料"-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <div slot="reference" class="name-wrapper">-->
<!-- <span>{{ scope.row.popular}}</span>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
label="任务号"
width="180">

110
wms-vue/src/components/duochaxun/Kucunhuizong.vue
View File

@ -183,18 +183,18 @@
<span style="margin-left: 10px">{{ scope.row.id }}</span>
</template>
</el-table-column>
<el-table-column
label="ID"
width="180">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.id}}</span>
</div>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- label="ID"-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <div slot="reference" class="name-wrapper">-->
<!-- <span>{{ scope.row.id}}</span>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
label="库位号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.locCode }}</span>
@ -203,7 +203,7 @@
</el-table-column>
<el-table-column
label="料号"
width="180">
width="160">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.itemCode }}</span>
@ -211,6 +211,7 @@
</template>
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
label="描述"
width="180">
<template slot-scope="scope">
@ -221,7 +222,7 @@
</el-table-column>
<el-table-column
label="序列号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.barCode }}</span>
@ -230,7 +231,7 @@
</el-table-column>
<el-table-column
label="状态"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.status }}</span>
@ -239,7 +240,7 @@
</el-table-column>
<el-table-column
label="库位ID"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.LOCATION_ID }}</span>
@ -248,7 +249,7 @@
</el-table-column>
<el-table-column
label="料号属性ID"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.ITEM_KEY_ID }}</span>
@ -257,7 +258,7 @@
</el-table-column>
<el-table-column
label="库存数量"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.quantity}}</span>
@ -266,7 +267,7 @@
</el-table-column>
<el-table-column
label="占用数量"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.queuedQuantity }}</span>
@ -275,7 +276,7 @@
</el-table-column>
<el-table-column
label="批次号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.propC1 }}</span>
@ -284,7 +285,7 @@
</el-table-column>
<el-table-column
label="LOC"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.propC2 }}</span>
@ -293,7 +294,7 @@
</el-table-column>
<el-table-column
label="特殊标记"
width="180">
width="60">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.propC3 }}</span>
@ -302,7 +303,7 @@
</el-table-column>
<el-table-column
label="部门"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.propC4 }}</span>
@ -311,7 +312,7 @@
</el-table-column>
<el-table-column
label="供应商编号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.propC5 }}</span>
@ -320,7 +321,7 @@
</el-table-column>
<el-table-column
label="申请人编号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.propC6 }}</span>
@ -329,7 +330,7 @@
</el-table-column>
<el-table-column
label="申请人"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.propC7 }}</span>
@ -337,8 +338,9 @@
</template>
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
label="暂存原因"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.propC8 }}</span>
@ -347,7 +349,7 @@
</el-table-column>
<el-table-column
label="工厂"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.propC9 }}</span>
@ -356,7 +358,7 @@
</el-table-column>
<el-table-column
label="入库单号"
width="180">
width="160">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.soi }}</span>
@ -368,7 +370,7 @@
width="180">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.propD1 }}</span>
<span>{{scope.row.prop_D1!=null?new Date(scope.row.prop_D1).toISOString().replace('T','').substring(0,10):scope.row.prop_D1}}</span>
</div>
</template>
</el-table-column>
@ -377,13 +379,13 @@
width="180">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.propD2 }}</span>
<span>{{scope.row.prop_D2!=null?new Date(scope.row.prop_D2).toISOString().replace('T','').substring(0,10):scope.row.prop_D1}}</span>
</div>
</template>
</el-table-column>
<el-table-column
label="库区"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.kqName }}</span>
@ -392,7 +394,7 @@
</el-table-column>
<el-table-column
label="库区ID"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.ZONE_ID }}</span>
@ -401,7 +403,7 @@
</el-table-column>
<el-table-column
label="是否盘点"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.lock==1?"是":"否"}}</span>
@ -410,7 +412,7 @@
</el-table-column>
<el-table-column
label="AGV库位"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.LSname }}</span>
@ -419,7 +421,7 @@
</el-table-column>
<el-table-column
label="是否SAP料号"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.Be_SAP_Item==1?"是":"否"}}</span>
@ -428,7 +430,7 @@
</el-table-column>
<el-table-column
label="体积"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.VOLUME }}</span>
@ -436,7 +438,7 @@
</template>
</el-table-column><el-table-column
label="是否危化品"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.BE_WEIGHT==1?"是":"否" }}</span>
@ -445,7 +447,7 @@
</el-table-column>
<el-table-column
label="库存价值等级"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.SHIP_RULES }}</span>
@ -453,7 +455,7 @@
</template>
</el-table-column><el-table-column
label="OA料号"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.FEE_TYPE }}</span>
@ -462,7 +464,7 @@
</el-table-column>
<el-table-column
label="是否批号管理"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.SINGLE_ITEM==1?"是":"否" }}</span>
@ -471,7 +473,7 @@
</el-table-column>
<el-table-column
label="是否序列号"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.BE_MARK_WEIGHT ==1?"是":"否"}}</span>
@ -480,7 +482,7 @@
</el-table-column>
<el-table-column
label="单位"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.UNIT }}</span>
@ -489,7 +491,7 @@
</el-table-column>
<el-table-column
label="备注"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.STR_EXTEND1 }}</span>
@ -498,7 +500,7 @@
</el-table-column>
<el-table-column
label="币种"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.STR_EXTEND2 }}</span>
@ -507,7 +509,7 @@
</el-table-column>
<el-table-column
label="标准价"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.STR_EXTEND3 }}</span>
@ -516,7 +518,7 @@
</el-table-column>
<el-table-column
label="库存单位"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.STR_EXTEND4 }}</span>
@ -525,7 +527,7 @@
</el-table-column>
<el-table-column
label="是否在GAV仓"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.agvFlag==1?"是":"否" }}</span>
@ -534,7 +536,7 @@
</el-table-column>
<el-table-column
label="库位id"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.locId }}</span>
@ -543,7 +545,7 @@
</el-table-column>
<el-table-column
label="库位类型"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.lts_name }}</span>
@ -551,7 +553,7 @@
</template>
</el-table-column> <el-table-column
label="是否有效期管理"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.validity==1?"是":"否" }}</span>
@ -560,15 +562,15 @@
</el-table-column>
<el-table-column
label="库存日期"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.storageDate }}</span>
<span>{{ new Date(scope.row.storageDate).toISOString().replace('T','').substring(0,10)}}</span>
</div>
</template>
</el-table-column> <el-table-column
label="工作站"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.moveStatus }}</span>
@ -577,7 +579,7 @@
</el-table-column>
<el-table-column
label="退料标记"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.inv_status }}</span>
@ -585,7 +587,7 @@
</template>
</el-table-column> <el-table-column
label="重量"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.WEIGHT }}</span>

79
wms-vue/src/components/duochaxun/Kucunrizhi.vue
View File

@ -114,18 +114,18 @@
<span style="margin-left: 10px">{{ scope.row.id }}</span>
</template>
</el-table-column>
<el-table-column
label="ID"
width="180">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.id}}</span>
</div>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- label="ID"-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <div slot="reference" class="name-wrapper">-->
<!-- <span>{{ scope.row.id}}</span>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
label="相关单号"
width="180">
width="150">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.RELATED_BILL }}</span>
@ -134,16 +134,34 @@
</el-table-column>
<el-table-column
label="日记类型"
width="180">
width="120">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.LOG_TYPE }}</span>
<span v-if="scope.row.LOG_TYPE=='ARRANGEMENT'">整理</span>
<span v-else-if="scope.row.LOG_TYPE=='RECEIVING'">入库</span>
<span v-else-if="scope.row.LOG_TYPE=='SHIPPING'">拣配</span>
<span v-else-if="scope.row.LOG_TYPE=='FROZEN'">冻结</span>
<span v-else-if="scope.row.LOG_TYPE=='CHECK_ADJUST'">盘点调整</span>
<span v-else-if="scope.row.LOG_TYPE=='HAND_ORDER'">交单</span>
<span v-else-if="scope.row.LOG_TYPE=='MOVE'">移库</span>
<span v-else-if="scope.row.LOG_TYPE=='SOLUTION_K'">解K</span>
<span v-else-if="scope.row.LOG_TYPE=='RECEIVING_ADJUST'">其它入库</span>
<span v-else-if="scope.row.LOG_TYPE=='SHIPPING_ADJUST'">其它出库</span>
<span v-else-if="scope.row.LOG_TYPE=='CONVERT_PACKAGEUNIT'">工单退料</span>
<span v-else-if="scope.row.LOG_TYPE=='INVENTORY_ADJUST'">调整</span>
<span v-else-if="scope.row.LOG_TYPE=='COUNT_ADJUST'">删除库存</span>
<span v-else-if="scope.row.LOG_TYPE=='PROCESS_DOWN'">取消整理</span>
<span v-else-if="scope.row.LOG_TYPE=='PROCESS_UP'">合单</span>
<span v-else-if="scope.row.LOG_TYPE=='MODIFY_LOT'">批次调整</span>
<span v-else-if="scope.row.LOG_TYPE=='MODIFY_STATUS'">状态调整</span>
<span v-else-if="scope.row.LOG_TYPE=='COMPANY_TRANS_OUT'">异常登记</span>
<span v-else-if="scope.row.LOG_TYPE=='COMPANY_TRANS_IN'">取消分配</span>
</div>
</template>
</el-table-column>
<el-table-column
label="单据类型"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.NAME }}</span>
@ -152,7 +170,7 @@
</el-table-column>
<el-table-column
label="源库位"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.loc1_code }}</span>
@ -161,7 +179,7 @@
</el-table-column>
<el-table-column
label="目标库位"
width="180">
width="s80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.loc_code }}</span>
@ -170,7 +188,7 @@
</el-table-column>
<el-table-column
label="料号"
width="180">
width="160">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.i_code }}</span>
@ -178,6 +196,7 @@
</template>
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
label="描述"
width="180">
<template slot-scope="scope">
@ -188,7 +207,7 @@
</el-table-column>
<el-table-column
label="单位"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.UNIT }}</span>
@ -197,7 +216,7 @@
</el-table-column>
<el-table-column
label="发生数量"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.number }}</span>
@ -206,7 +225,7 @@
</el-table-column>
<el-table-column
label="操作人"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.OPERATOR }}</span>
@ -218,13 +237,14 @@
width="180">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.OCCUR_TIME }}</span>
<span>{{ scope.row.OCCUR_TIME!=null?new Date(scope.row.OCCUR_TIME).toISOString().replace('T','').substring(0,10):scope.row.OCCUR_TIME}}</span>
</div>
</template>
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
label="备注"
width="180">
width="120">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.DESCRIPTION }}</span>
@ -233,7 +253,7 @@
</el-table-column>
<el-table-column
label="批号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C1 }}</span>
@ -242,7 +262,7 @@
</el-table-column>
<el-table-column
label="LOC"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C2 }}</span>
@ -251,7 +271,7 @@
</el-table-column>
<el-table-column
label="特殊标记"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C3 }}</span>
@ -260,7 +280,7 @@
</el-table-column>
<el-table-column
label="供应商编号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{scope.row.PROP_C5}}</span>
@ -268,8 +288,9 @@
</template>
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
label="暂存原因"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C8}}</span>
@ -278,7 +299,7 @@
</el-table-column>
<el-table-column
label="工厂"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C9 }}</span>
@ -287,7 +308,7 @@
</el-table-column>
<el-table-column
label="工作站"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.endRegion}}</span>
@ -296,7 +317,7 @@
</el-table-column>
<el-table-column
label="容器"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.LP}}</span>

138
wms-vue/src/components/duochaxun/dcx.vue → wms-vue/src/components/duochaxun/Liaoxiangjiankong.vue
View File

@ -10,9 +10,9 @@
<el-select v-model="param.ct_code" multiple filterable placeholder="请选择类型" style="width: 100%;">
<el-option
v-for="item in typess"
:key="item.index"
:label="item.code"
:value="item.code"
:key="item.label"
:label="item.values"
:value="item.values"
>
</el-option>
</el-select>
@ -33,6 +33,20 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="状态:" >
<el-select v-model="param.s_status" multiple filterable placeholder="请选择状态" >
<el-option
v-for="item in Sstatus"
:key="item.label"
:label="item.values"
:value="item.values"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-button type="success" @click="find">查找</el-button>
@ -41,8 +55,8 @@
</div>
<el-table
show-summary
:summary-method="getSummaries"
show-summary
v-loading="this.tableloding"
:height="MaxHeight"
:header-cell-style="{background:'#000',color:'#fff'}"
@ -125,7 +139,6 @@ export default {
return {
tableloding: false,
isShow:false,//是否展示全部搜索条件
tableData: [],
pageSize: 50,
pageNum: 1,
@ -133,9 +146,31 @@ export default {
param: {
ct_code: [],
agvFlag: '',
s_status: [],
},
//类型
typess: [],
typess: [
{
values: 'X1',
label: 1,
},
{
values: 'X2',
label: 2,
},
{
values: 'X4',
label: 3,
},
{
values: 'X8',
label: 4,
},
{
values: 'XN',
label: 5,
},
],
//是否
agvFlag: [{
values: '是',
@ -145,6 +180,21 @@ export default {
label: 0,
}
],
//状态
Sstatus:[
{
values: 'FREE',
label: 1,
},
{
values: 'STATUS',
label: 2,
},
{
values: 'OCCUPY',
label: 3,
},
],
}
},computed:{
MaxHeight(){
@ -153,19 +203,51 @@ export default {
},
mounted: function () {
this.queryUser();
this.Typess();
//this.Typess();
},updated() {
this.$nextTick(() => {
if(this.$refs.tableData!=null){
this.$refs.tableData.doLayout()
}
})
},
methods: {
// 求和操作
getSummaries(param) {
const { columns, data } = param
const sums = []
//解构赋值
//columns:所有列的集合
//data:你的原始数据 [{id:1,num:1,price:20},{id:2,num:1,price:20},{id:3,num:1,price:20}]
const {
columns,
data
} = param;
//准备一个空的结果数组,用来存放每一列的和
const sums = [];
columns.forEach((column, index) => {
if (index === 4) {
sums[index] = '汇总:' + 10;
//金额的计算 data里的num字段和price相乘
if (index == 4) {
sums[index]="汇总:"
const values = data.map(item => Number(item['shu']));
sums[index] += values.reduce((prev, curr) => {
const value = Number(curr);
//确定数据是否为空,不为空进行计算,为空返回原值
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
})
return sums
},0)
}
else {
sums[index] = '';
}
});
return sums;
},
handleEdit(index, row) {
console.log(index, row);
@ -184,21 +266,21 @@ export default {
this.pageNum = val;
this.queryUser();
},
Typess(){
this.$axios.post(this.$httpUrl + '/dcx/type', {
}).then(res => res.data)
.then(res => {
if (res.code == 200) {
this.typess = res.data;
} else {
this.$message.error('获取数据失败');
}
// eslint-disable-next-line no-unused-vars
},err=>{
this.tableloding=false;
})
},
// Typess(){
// this.$axios.post(this.$httpUrl + '/dcx/type', {
//
// }).then(res => res.data)
// .then(res => {
// if (res.code == 200) {
// this.typess = res.data;
// } else {
// this.$message.error('获取数据失败');
// }
// // eslint-disable-next-line no-unused-vars
// },err=>{
// this.tableloding=false;
// })
// },
queryUser() {
//列表数据加载

76
wms-vue/src/components/duochaxun/Rukuzhengli.vue
View File

@ -140,18 +140,18 @@
<span style="margin-left: 10px">{{ scope.row.id }}</span>
</template>
</el-table-column>
<el-table-column
label="ID"
width="180">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.id}}</span>
</div>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- label="ID"-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <div slot="reference" class="name-wrapper">-->
<!-- <span>{{ scope.row.id}}</span>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
label="采购单号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.sourceId }}</span>
@ -160,7 +160,7 @@
</el-table-column>
<el-table-column
label="凭证号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.strBill7 }}</span>
@ -169,7 +169,7 @@
</el-table-column>
<el-table-column
label="行号"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.strBill8 }}</span>
@ -178,7 +178,7 @@
</el-table-column>
<el-table-column
label="料号"
width="180">
width="160">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.code }}</span>
@ -186,6 +186,7 @@
</template>
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
label="描述"
width="180">
<template slot-scope="scope">
@ -196,7 +197,7 @@
</el-table-column>
<el-table-column
label="单位"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.unit }}</span>
@ -205,7 +206,7 @@
</el-table-column>
<el-table-column
label="加急标记"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.strBill11 }}</span>
@ -214,7 +215,7 @@
</el-table-column>
<el-table-column
label="批次"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C1 }}</span>
@ -223,7 +224,7 @@
</el-table-column>
<el-table-column
label="LOC"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C2 }}</span>
@ -232,7 +233,7 @@
</el-table-column>
<el-table-column
label="特殊标记"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C3 }}</span>
@ -241,7 +242,7 @@
</el-table-column>
<el-table-column
label="供应商编号"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C5 }}</span>
@ -250,7 +251,7 @@
</el-table-column>
<el-table-column
label="区域"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C8 }}</span>
@ -259,7 +260,7 @@
</el-table-column>
<el-table-column
label="工厂"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C9 }}</span>
@ -268,7 +269,7 @@
</el-table-column>
<el-table-column
label="收货数量"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.EXPECTED_QUANTITY }}</span>
@ -277,7 +278,7 @@
</el-table-column>
<el-table-column
label="整理数量"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.RECEIVED_QUANTITY }}</span>
@ -286,7 +287,7 @@
</el-table-column>
<el-table-column
label="收货日期"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ new Date(scope.row.ORDER_DATE).toISOString().replace('T', ' ').substring(0, 10) }}</span>
@ -295,7 +296,7 @@
</el-table-column>
<el-table-column
label="收货时间"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ new Date(scope.row.ORDER_DATE).toISOString().replace('T', ' ').substring(10,19)}}</span>
@ -304,7 +305,7 @@
</el-table-column>
<el-table-column
label="序列号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.strBill2 }}</span>
@ -313,7 +314,7 @@
</el-table-column>
<el-table-column
label="整理日期"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ new Date(scope.row.RECEIVE_DATE).toISOString().replace('T','').substring(0,10) }}</span>
@ -322,7 +323,7 @@
</el-table-column>
<el-table-column
label="整理时间"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ new Date(scope.row.RECEIVE_DATE).toISOString().replace('T','').substring(10,18)}}</span>
@ -331,7 +332,7 @@
</el-table-column>
<el-table-column
label="整理人"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.USER_NAME }}</span>
@ -341,25 +342,25 @@
<el-table-column
label="预入库日期"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ new Date(scope.row.DELIVERY_DATE).toISOString().replace('T','').substring(0,10) }}</span>
<span>{{scope.row.DELIVERY_DATE!=null?new Date(scope.row.DELIVERY_DATE).toISOString().replace('T','').substring(0,10):scope.row.DELIVERY_DATE}}</span>
</div>
</template>
</el-table-column>
<el-table-column
label="预入库时间"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ new Date(scope.row.DELIVERY_DATE).toISOString().replace('T','').substring(10,18) }}</span>
<span>{{ scope.row.DELIVERY_DATE!=null?new Date(scope.row.DELIVERY_DATE).toISOString().replace('T','').substring(0,10):scope.row.DELIVERY_DATE }}</span>
</div>
</template>
</el-table-column>
<el-table-column
label="预入库操作人"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.RELATED_BILL5 }}</span>
@ -367,8 +368,9 @@
</template>
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
label="备注"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.description }}</span>
@ -377,7 +379,7 @@
</el-table-column>
<el-table-column
label="是否质检"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.BE_QUALITY }}</span>
@ -386,7 +388,7 @@
</el-table-column>
<el-table-column
label="SAP接口号"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.CODE }}</span>

62
wms-vue/src/components/duochaxun/Zhengliqingdan.vue
View File

@ -247,18 +247,18 @@
<span style="margin-left: 10px">{{ scope.row.id }}</span>
</template>
</el-table-column>
<el-table-column
label="ID"
width="180">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.id}}</span>
</div>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- label="ID"-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <div slot="reference" class="name-wrapper">-->
<!-- <span>{{ scope.row.id}}</span>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
label="采购单号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.sourceId }}</span>
@ -267,7 +267,7 @@
</el-table-column>
<el-table-column
label="凭证号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.strBill7 }}</span>
@ -276,7 +276,7 @@
</el-table-column>
<el-table-column
label="行号"
width="180">
width="60">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.strBill8 }}</span>
@ -285,7 +285,7 @@
</el-table-column>
<el-table-column
label="料号"
width="180">
width="160">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.i_CODE }}</span>
@ -293,6 +293,7 @@
</template>
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
label="描述"
width="180">
<template slot-scope="scope">
@ -303,7 +304,7 @@
</el-table-column>
<el-table-column
label="单位"
width="180">
width="60">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.UNIT }}</span>
@ -312,25 +313,25 @@
</el-table-column>
<el-table-column
label="收货日期"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.ORDER_DATE }}</span>
<span>{{new Date(scope.row.ORDER_DATE).toISOString().replace('T','').substring(0,10) }}</span>
</div>
</template>
</el-table-column>
<el-table-column
label="整理日期"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.RECEIVE_DATE }}</span>
<span>{{ new Date(scope.row.RECEIVE_DATE).toISOString().replace('T','').substring(0,10) }}</span>
</div>
</template>
</el-table-column>
<el-table-column
label="整理人"
width="180">
width="60">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.OPERATOR }}</span>
@ -339,7 +340,7 @@
</el-table-column>
<el-table-column
label="上架人"
width="180">
width="60">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.w_NAME }}</span>
@ -348,7 +349,7 @@
</el-table-column>
<el-table-column
label="容器"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.LP }}</span>
@ -357,7 +358,7 @@
</el-table-column>
<el-table-column
label="批号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C1 }}</span>
@ -366,7 +367,7 @@
</el-table-column>
<el-table-column
label="LOC"
width="180">
width="60">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C2 }}</span>
@ -375,7 +376,7 @@
</el-table-column>
<el-table-column
label="特殊标记"
width="180">
width="60">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C3 }}</span>
@ -384,7 +385,7 @@
</el-table-column>
<el-table-column
label="供应商编号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C5 }}</span>
@ -393,7 +394,7 @@
</el-table-column>
<el-table-column
label="区域"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C8 }}</span>
@ -402,7 +403,7 @@
</el-table-column>
<el-table-column
label="工厂"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C9 }}</span>
@ -411,7 +412,7 @@
</el-table-column>
<el-table-column
label="序列号"
width="180">
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.BAR_CODE }}</span>
@ -420,7 +421,7 @@
</el-table-column>
<el-table-column
label="是否上架"
width="180">
width="80">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.BE_MOVED==1?"上架":"未上架" }}</span>
@ -428,6 +429,7 @@
</template>
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
label="备注"
width="180">
<template slot-scope="scope">
@ -447,7 +449,7 @@
</el-table-column>
<el-table-column
label="库位号"
width="180">
width="60">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.lc_CODE }}</span>

10
wms-vue/src/router/router.js
View File

@ -22,7 +22,7 @@ const routes=[
meta:{
title:'首页'
},
component: () => import('../components/duochaxun/dcx')
component: () => import('../components/Login')
},
{
path:'/Zhengliqingdan',
@ -65,12 +65,12 @@ const routes=[
component: () => import('@/components/duochaxun/Kucunrizhi.vue')
},
{
path:'/dcx',
name:'dcx',
path:'/Liaoxiangjiankong',
name:'Liaoxiangjiankong',
meta:{
title:'多查询'
title:''
},
component: () => import('@/components/duochaxun/dcx.vue')
component: () => import('@/components/duochaxun/Liaoxiangjiankong.vue')
},
]

5
wms/src/main/java/com/yc/wms/bean/Modeldcx.java → wms/src/main/java/com/yc/wms/bean/Liaoxiangjiankong.java
View File

@ -1,10 +1,13 @@
package com.yc.wms.bean;
public class Modeldcx {
public class Liaoxiangjiankong {
//类型
public String[] ct_code;
//是否
public String agvFlag;
//状态
public String[] s_status;
}

9
wms/src/main/java/com/yc/wms/controller/dcxController.java → wms/src/main/java/com/yc/wms/controller/LiaoxiangjiankongController.java
View File

@ -3,8 +3,7 @@ package com.yc.wms.controller;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.yc.wms.bean.Modeldcx;
import com.yc.wms.service.Zwdcx;
import com.yc.wms.bean.Liaoxiangjiankong;
import com.yc.wms.until.QueryPageUtil;
import com.yc.wms.until.Result;
import lombok.extern.slf4j.Slf4j;
@ -14,9 +13,9 @@ import org.springframework.web.bind.annotation.*;
@RestController
@Slf4j
@RequestMapping("/dcx")
public class dcxController {
public class LiaoxiangjiankongController {
@Autowired
private Zwdcx dcx;
private com.yc.wms.service.Liaoxiangjiankong dcx;
@PostMapping("/querydcx")
@ -29,7 +28,7 @@ public class dcxController {
JSONObject param= (JSONObject)jsonObject.get("param");
Modeldcx d = JSONUtil.toBean(param.toString(), Modeldcx.class);
Liaoxiangjiankong d = JSONUtil.toBean(param.toString(), Liaoxiangjiankong.class);
return dcx.QueryJson(query,d);
}

6
wms/src/main/java/com/yc/wms/controller/UserController.java
View File

@ -74,9 +74,9 @@ public class UserController {
menu.put("menuComponent","/Kucunrizhi");
menu.put("menuClick","Kucunrizhi");
}else if(i==6) {
menu.put("menuName", "666");
menu.put("menuComponent","/dcx");
menu.put("menuClick","dcx");
menu.put("menuName", "料箱监控");
menu.put("menuComponent","/Liaoxiangjiankong");
menu.put("menuClick","Liaoxiangjiankong");
}
menu.put("menuLevel",i);
menu.put("menuParentCode",i);

5
wms/src/main/java/com/yc/wms/service/Zwdcx.java → wms/src/main/java/com/yc/wms/service/Liaoxiangjiankong.java
View File

@ -1,13 +1,12 @@
package com.yc.wms.service;
import com.yc.wms.bean.Modeldcx;
import com.yc.wms.until.QueryPageUtil;
import com.yc.wms.until.Result;
public interface Zwdcx {
public interface Liaoxiangjiankong {
// 条件查询加分页
Result QueryJson(QueryPageUtil query, Modeldcx dcx);
Result QueryJson(QueryPageUtil query, com.yc.wms.bean.Liaoxiangjiankong dcx);
//下拉
Result Type();

6
wms/src/main/java/com/yc/wms/service/impl/KucunhuizongImpl.java
View File

@ -49,8 +49,8 @@ public class KucunhuizongImpl implements Kucunhuizong {
"max(ik.PROP_C8) as propC8,--暂存原因\n" +
"max(ik.PROP_C9) as propC9,--工厂\n" +
"max(inv.SOI) as soi,--入库单号\n" +
"max(ik.PROP_D1) as propD1,--生产日期\n" +
"max(ik.PROP_D2) as propD2,--到日期\n" +
"max(ik.PROP_D1) prop_D1,--生产日期\n" +
"max(ik.PROP_D2) prop_D2,--到日期\n" +
"max(z.name) as kqName,--库区\n" +
"max(z.ID) as ZONE_ID,--库区ID\n" +
"\n" +
@ -93,7 +93,7 @@ public class KucunhuizongImpl implements Kucunhuizong {
"left join ITEM item on item.id=ik.ITEM_ID\n" +
"left join STOCK stock on stock.ID=inv.LP\n" +
"left join LOCATION_STORAGE ls on ls.ID=stock.locationStorage_ID\n" +
"where 1=1 and inv.QUANTITY>0";
"where 1=1 and inv.QUANTITY>0 and item.Be_SAP_Item=1 and lts.NAME in('存货','不良品') and inv.status in('已入库','整理中','冻结','质检中')";
//库位号
if(kucunhuizong.locCode!=null){

23
wms/src/main/java/com/yc/wms/service/impl/dcxImpl.java → wms/src/main/java/com/yc/wms/service/impl/LiaoxiangjiankongImpl.java
View File

@ -1,7 +1,6 @@
package com.yc.wms.service.impl;
import com.yc.wms.bean.Modeldcx;
import com.yc.wms.service.Zwdcx;
import com.yc.wms.bean.Liaoxiangjiankong;
import com.yc.wms.until.QueryPageUtil;
import com.yc.wms.until.Result;
import lombok.extern.slf4j.Slf4j;
@ -17,13 +16,13 @@ import java.util.Map;
@Slf4j
@Service
public class dcxImpl implements Zwdcx {
public class LiaoxiangjiankongImpl implements com.yc.wms.service.Liaoxiangjiankong {
@Autowired
private NamedParameterJdbcTemplate jdbcTemplate;
@Override
public Result QueryJson(QueryPageUtil query, Modeldcx dcx) {
public Result QueryJson(QueryPageUtil query, Liaoxiangjiankong dcx) {
int pageNum = query.getPageNum();//当前页
int pageSize = query.getPageSize();//条数
@ -46,7 +45,7 @@ public class dcxImpl implements Zwdcx {
sb.append("'"+ dcx.ct_code[i]+"'"+",");
}
}
sql+=" and ct.code in ("+sb.toString()+")";;
sql+=" and ct.code in ("+sb.toString()+")";
}
//是否
@ -54,6 +53,20 @@ public class dcxImpl implements Zwdcx {
sql+=" and s.agvFlag ="+"'"+dcx.agvFlag+"'";
}
//状态
if(dcx.s_status!=null&& dcx.s_status.length>0){
StringBuffer sb = new StringBuffer();
for (int i = 0; i< dcx.s_status.length; i++){
if(dcx.s_status.length-1==i){
sb.append("'"+ dcx.s_status[i]+"'");
}else {
sb.append("'"+ dcx.s_status[i]+"'"+",");
}
}
sql+=" and s.STATUS in ("+sb.toString()+")";
}
String sqlCount = "select count(t.code) as nums from(" + sql+"\n GROUP BY ct.code,s.STATUS,s.agvFlag \n"+
") t";
String sqlFy = "select t.* from(" + sql+"GROUP BY ct.code,s.STATUS,s.agvFlag \n" +