|
|
|
|
@ -15,7 +15,7 @@ import drawDw from './comps/dw'
|
|
|
|
|
import drawPgd from './comps/pgd'
|
|
|
|
|
import baifang from "./comps/baifang";
|
|
|
|
|
import {sljh} from "@/views/zyjhzx/lliaofkui/comps/sljh";
|
|
|
|
|
import {getPgd,getPgd2, getYcldw, shangLiao} from "@/api/zyjh";
|
|
|
|
|
import {bgControl, getPgd, getPgd2, getYcldw, shangLiao} from "@/api/zyjh";
|
|
|
|
|
import {getBzryList} from "@/api/sjzx/bzzGL";
|
|
|
|
|
import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue";
|
|
|
|
|
import TipsComp from "@/views/zyjhzx/components/TipsComp.vue";
|
|
|
|
|
@ -65,6 +65,10 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
mounted() {
|
|
|
|
|
Array.prototype.r = function(str){
|
|
|
|
|
const [start,end]=str.split(':').map(Number);
|
|
|
|
|
return this.slice(start, end);
|
|
|
|
|
}
|
|
|
|
|
this.$socket.open()
|
|
|
|
|
this.wsSubscribe()
|
|
|
|
|
this.initKonvaStage();
|
|
|
|
|
@ -88,40 +92,41 @@ export default {
|
|
|
|
|
let index=0
|
|
|
|
|
for (const item of this.sljhItemList) {
|
|
|
|
|
if (item.djh===data.djh||item.djh.slice(-djhWhLengh)===data.msg.orderNumber){
|
|
|
|
|
if (!!this.currentDw.tzbh&&item.kw===this.currentDw.tzbh){
|
|
|
|
|
const tmpZxData={
|
|
|
|
|
id:item.id,
|
|
|
|
|
lldw:this.currentDw.id,
|
|
|
|
|
llcs:this.dw[this.currentDwIndex].list.length+1,
|
|
|
|
|
llfkry:this.getCurrentWorker()?.userCode
|
|
|
|
|
}
|
|
|
|
|
const data={
|
|
|
|
|
ydjh:tmpZxData,
|
|
|
|
|
ydid:item.id,
|
|
|
|
|
dwId:this.currentDw.id,
|
|
|
|
|
ceng:this.dw[this.currentDwIndex].list.length+1,
|
|
|
|
|
czbh:item.dcCh,
|
|
|
|
|
pl:item.dcPl,
|
|
|
|
|
fd:item.dcFd,
|
|
|
|
|
kw:item.kw,
|
|
|
|
|
zl:item.zl,
|
|
|
|
|
tlth:item.tzbh,
|
|
|
|
|
wph:item.wpxh,
|
|
|
|
|
wpgg:item.wpgg,
|
|
|
|
|
sljhrq:item.sljhrq,
|
|
|
|
|
qgjhrq:item.qgjhrq,
|
|
|
|
|
bfr:this.currentWorker?.userCode,
|
|
|
|
|
type:'LLJ'
|
|
|
|
|
}
|
|
|
|
|
// if (!!this.currentDw.tzbh&&item.kw===this.currentDw.tzbh){
|
|
|
|
|
//
|
|
|
|
|
// }else{
|
|
|
|
|
// this.$message.warning(`理料垛位错误,请放入${this.kwNameFormat(item.kw)}所在垛位`)
|
|
|
|
|
// }
|
|
|
|
|
const tmpZxData={
|
|
|
|
|
id:item.id,
|
|
|
|
|
lldw:this.currentDw.id,
|
|
|
|
|
llcs:this.dw[this.currentDwIndex].list.length+1,
|
|
|
|
|
llfkry:this.getCurrentWorker()?.userCode
|
|
|
|
|
}
|
|
|
|
|
const data={
|
|
|
|
|
ydjh:tmpZxData,
|
|
|
|
|
ydid:item.id,
|
|
|
|
|
dwId:this.currentDw.id,
|
|
|
|
|
ceng:this.dw[this.currentDwIndex].list.length+1,
|
|
|
|
|
czbh:item.dcCh,
|
|
|
|
|
pl:item.dcPl,
|
|
|
|
|
fd:item.dcFd,
|
|
|
|
|
kw:item.kw,
|
|
|
|
|
zl:item.zl,
|
|
|
|
|
tlth:item.tzbh,
|
|
|
|
|
wph:item.wpxh,
|
|
|
|
|
wpgg:item.wpgg,
|
|
|
|
|
sljhrq:item.sljhrq,
|
|
|
|
|
qgjhrq:item.qgjhrq,
|
|
|
|
|
bfr:this.currentWorker?.userCode,
|
|
|
|
|
type:'LLJ'
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
shangLiao(data).then(res=>{})
|
|
|
|
|
shangLiao(data).then(res=>{})
|
|
|
|
|
|
|
|
|
|
this.sljhItemList.splice(index,1)
|
|
|
|
|
this.sljhGroup.destroyChildren()
|
|
|
|
|
this.drawSljhItem(this.sljhItemList)
|
|
|
|
|
}else{
|
|
|
|
|
this.$message.warning(`理料垛位错误,请放入${this.kwNameFormat(item.kw)}所在垛位`)
|
|
|
|
|
}
|
|
|
|
|
this.sljhItemList.splice(index,1)
|
|
|
|
|
this.sljhGroup.destroyChildren()
|
|
|
|
|
this.drawSljhItem(this.sljhItemList.r('0:20'))
|
|
|
|
|
break
|
|
|
|
|
}
|
|
|
|
|
index++
|
|
|
|
|
@ -140,43 +145,9 @@ export default {
|
|
|
|
|
} else {
|
|
|
|
|
this.dw[data.dwId].list.push(data)
|
|
|
|
|
}
|
|
|
|
|
this.initSljhItem()
|
|
|
|
|
this.initDw()
|
|
|
|
|
})
|
|
|
|
|
// this.sockets.subscribe('zyjhzx', data => {
|
|
|
|
|
// if (this.zt===data.zt){
|
|
|
|
|
// const item=data.zyjh
|
|
|
|
|
// let dwId=0
|
|
|
|
|
// let dwCeng=0
|
|
|
|
|
// for (const dw of this.dw) {
|
|
|
|
|
// if(dw.tzbh===data.zyjh.kw){
|
|
|
|
|
// dwId=dw.dwId
|
|
|
|
|
// dwCeng=dw.list.length
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// const tmp={
|
|
|
|
|
// ydjh:item,
|
|
|
|
|
// dwId:dwId,
|
|
|
|
|
// ceng:dwCeng+1,
|
|
|
|
|
// czbh:item.dcCh,
|
|
|
|
|
// pl:item.dcPl,
|
|
|
|
|
// fd:item.dcFd,
|
|
|
|
|
// kw:item.kw,
|
|
|
|
|
// zl:item.zl,
|
|
|
|
|
// tlth:item.tzbh,
|
|
|
|
|
// wph:item.wpxh,
|
|
|
|
|
// wpgg:item.wpgg,
|
|
|
|
|
// sljhrq:item.sljhrq,
|
|
|
|
|
// qgjhrq:item.qgjhrq,
|
|
|
|
|
// bfr:data.zyjh.llry,
|
|
|
|
|
// type:'LLJ'
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// shangLiao(tmp).then(res=>{})
|
|
|
|
|
//
|
|
|
|
|
// }else{
|
|
|
|
|
// this.$message.error(`工单号错误:${data.gdh}`)
|
|
|
|
|
// }
|
|
|
|
|
// })
|
|
|
|
|
},
|
|
|
|
|
initPgd(pgd={}){
|
|
|
|
|
const group=this.drawGd(pgd)
|
|
|
|
|
@ -247,47 +218,48 @@ export default {
|
|
|
|
|
const maxY=y+that.height*0.8-20
|
|
|
|
|
if(thisX>=x&&thisY>=y&&thisX<=maxX&&thisY<=maxY){
|
|
|
|
|
const item=this.getAttr('item')
|
|
|
|
|
if (!!that.currentDw.tzbh&&item.kw===that.currentDw.tzbh){
|
|
|
|
|
item.lldw=that.currentDw.id
|
|
|
|
|
item.llcs=that.dw[that.currentDwIndex].list.length+1
|
|
|
|
|
item.llfkry=that.getCurrentWorker()?.userCode
|
|
|
|
|
const tmpZxData={
|
|
|
|
|
id:item.id,
|
|
|
|
|
lldw:that.currentDw.id,
|
|
|
|
|
llcs:that.dw[that.currentDwIndex].list.length+1,
|
|
|
|
|
llfkry:that.getCurrentWorker()?.userCode
|
|
|
|
|
}
|
|
|
|
|
const data={
|
|
|
|
|
ydjh:tmpZxData,
|
|
|
|
|
ydid:item.id,
|
|
|
|
|
dwId:that.currentDw.id,
|
|
|
|
|
ceng:that.dw[that.currentDwIndex].list.length+1,
|
|
|
|
|
czbh:item.dcCh,
|
|
|
|
|
pl:item.dcPl,
|
|
|
|
|
fd:item.dcFd,
|
|
|
|
|
kw:item.kw,
|
|
|
|
|
zl:item.zl,
|
|
|
|
|
tlth:item.tzbh,
|
|
|
|
|
wph:item.wpxh,
|
|
|
|
|
wpgg:item.wpgg,
|
|
|
|
|
sljhrq:item.sljhrq,
|
|
|
|
|
qgjhrq:item.qgjhrq,
|
|
|
|
|
bfr:that.currentWorker?.userCode,
|
|
|
|
|
type:'LLJ'
|
|
|
|
|
}
|
|
|
|
|
// if (!!that.currentDw.tzbh&&item.kw===that.currentDw.tzbh){
|
|
|
|
|
//
|
|
|
|
|
// }else{
|
|
|
|
|
// that.$message.warning(`理料跨位错误,请放入${that.kwNameFormat(item.kw)}所在垛位`)
|
|
|
|
|
// this.remove()
|
|
|
|
|
// _that.visible(true)
|
|
|
|
|
// }
|
|
|
|
|
item.lldw=that.currentDw.id
|
|
|
|
|
item.llcs=that.dw[that.currentDwIndex].list.length+1
|
|
|
|
|
item.llfkry=that.getCurrentWorker()?.userCode
|
|
|
|
|
const tmpZxData={
|
|
|
|
|
id:item.id,
|
|
|
|
|
lldw:that.currentDw.id,
|
|
|
|
|
llcs:that.dw[that.currentDwIndex].list.length+1,
|
|
|
|
|
llfkry:that.getCurrentWorker()?.userCode
|
|
|
|
|
}
|
|
|
|
|
const data={
|
|
|
|
|
ydjh:tmpZxData,
|
|
|
|
|
ydid:item.id,
|
|
|
|
|
dwId:that.currentDw.id,
|
|
|
|
|
ceng:that.dw[that.currentDwIndex].list.length+1,
|
|
|
|
|
czbh:item.dcCh,
|
|
|
|
|
pl:item.dcPl,
|
|
|
|
|
fd:item.dcFd,
|
|
|
|
|
kw:item.kw,
|
|
|
|
|
zl:item.zl,
|
|
|
|
|
tlth:item.tzbh,
|
|
|
|
|
wph:item.wpxh,
|
|
|
|
|
wpgg:item.wpgg,
|
|
|
|
|
sljhrq:item.sljhrq,
|
|
|
|
|
qgjhrq:item.qgjhrq,
|
|
|
|
|
bfr:that.currentWorker?.userCode,
|
|
|
|
|
type:'LLJ'
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
shangLiao(data).then(res=>{})
|
|
|
|
|
shangLiao(data).then(res=>{})
|
|
|
|
|
|
|
|
|
|
this.remove()
|
|
|
|
|
this.remove()
|
|
|
|
|
|
|
|
|
|
that.sljhItemList.splice(this.getAttr('index'),1)
|
|
|
|
|
that.sljhGroup.destroyChildren()
|
|
|
|
|
that.drawSljhItem(that.sljhItemList)
|
|
|
|
|
}else{
|
|
|
|
|
that.$message.warning(`理料跨位错误,请放入${that.kwNameFormat(item.kw)}所在垛位`)
|
|
|
|
|
this.remove()
|
|
|
|
|
_that.visible(true)
|
|
|
|
|
}
|
|
|
|
|
that.sljhItemList.splice(this.getAttr('index'),1)
|
|
|
|
|
that.sljhGroup.destroyChildren()
|
|
|
|
|
that.drawSljhItem(this.sljhItemList.r('0:20'))
|
|
|
|
|
}else{
|
|
|
|
|
this.remove()
|
|
|
|
|
_that.visible(true)
|
|
|
|
|
@ -359,10 +331,25 @@ export default {
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
initSljhItem(){
|
|
|
|
|
getPgd2({field:'llfkry'}).then(res=>{
|
|
|
|
|
this.sljhItemList=res.data
|
|
|
|
|
this.drawSljhItem(res.data)
|
|
|
|
|
bgControl({}).then(res=>{
|
|
|
|
|
const gx=res.data||'1'
|
|
|
|
|
if (gx==='1'){
|
|
|
|
|
const data={
|
|
|
|
|
zt:'32',
|
|
|
|
|
}
|
|
|
|
|
getPgd(data).then(res => {
|
|
|
|
|
this.sljhItemList=res.data
|
|
|
|
|
this.drawSljhItem(this.sljhItemList.r('0:20'))
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
if (gx==='0'){
|
|
|
|
|
getPgd2({field:'llfkry'}).then(res=>{
|
|
|
|
|
this.sljhItemList=res.data
|
|
|
|
|
this.drawSljhItem(this.sljhItemList.r('0:20'))
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
initKonvaStage(){
|
|
|
|
|
this.width=this.$refs.pwpg.clientWidth
|
|
|
|
|
|
