|
|
@@ -31,11 +31,20 @@ export default {
|
|
|
repostCurd('select','{"tableName": "t_lhypb","paramWhere":{"yang_pin_bian_hao":"' + id + '","jie_yang_zhuang_t":"待接收","shi_fou_guo_shen_":"1"}}').then(res => {
|
|
|
if (res.variables.data && res.variables.data.length > 0) {
|
|
|
for (let i in res.variables.data) {
|
|
|
- res.variables.data[i].jie_yang_shu_lian = 1
|
|
|
- res.variables.data[i].jie_yang_zhuang_t = '未确认'
|
|
|
+ // res.variables.data[i].jie_yang_shu_lian = 1
|
|
|
+ // res.variables.data[i].jie_yang_zhuang_t = '未确认'
|
|
|
+ // res.variables.data[i].biao_zhi_uuid_ = this.uuid()
|
|
|
+ // this.listData.push(res.variables.data[i])
|
|
|
+ // this.OriginalPosition.push(res.variables.data[i].shi_fou_liu_yang_ == "是" ? res.variables.data[i].liu_yang_wei_zhi_ : res.variables.data[i].shou_yang_wei_zhi)
|
|
|
+ res.variables.data[i].jie_yang_shu_lian = res.variables.data[i].yang_pin_zong_shu
|
|
|
+ res.variables.data[i].jie_yang_zhuang_t = '已确认'
|
|
|
res.variables.data[i].biao_zhi_uuid_ = this.uuid()
|
|
|
+ res.variables.data[i].shi_fou_liu_yang_ = '是'
|
|
|
+ res.variables.data[i].yan_shou_jie_guo_ = '完好'
|
|
|
+ res.variables.data[i].liu_yang_ri_qi_ = this.dateFormat()
|
|
|
+ res.variables.data[i].liu_yang_qi_xian = dayjs(res.variables.data[i].song_jian_shi_jia).add(3,'month').format("YYYY-MM-DD")
|
|
|
+ res.variables.data[i].xiao_hui_ri_qi_ = dayjs(res.variables.data[i].liu_yang_qi_xian).endOf('month').format("YYYY-MM-DD")
|
|
|
this.listData.push(res.variables.data[i])
|
|
|
- // this.OriginalPosition.push(res.variables.data[i].shi_fou_liu_yang_ == "是" ? res.variables.data[i].liu_yang_wei_zhi_ : res.variables.data[i].shou_yang_wei_zhi)
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
@@ -59,24 +68,34 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
|
|
|
- submitData(type) {
|
|
|
- // this指针
|
|
|
- let this_ = this;
|
|
|
- // 回传关闭事件。隐藏当前组件。
|
|
|
- let changeWeiZhi; // 此处俩字段作用在下面 选择货位时出现重复位置 而重新更新样品登记表 收样位置|留样位置
|
|
|
- let changesyWeiZhi;
|
|
|
- let judge = true;
|
|
|
- this.$confirm('请再次确认 [样品接收信息]').then(_ => {
|
|
|
-
|
|
|
+ submitData(type) {
|
|
|
+ // this指针
|
|
|
+ let this_ = this;
|
|
|
+ let changeWeiZhi; // 此处俩字段作用在下面 选择货位时出现重复位置 而重新更新样品登记表 收样位置|留样位置
|
|
|
+ let changesyWeiZhi;
|
|
|
+ // 回传关闭事件。隐藏当前组件。
|
|
|
+ let judge = true;
|
|
|
+
|
|
|
+ if (this_.listData.length == 0) {
|
|
|
+ this.$emit('callback', true)
|
|
|
+ this.visable = false
|
|
|
+ this.$message({
|
|
|
+ message: '暂无样品待接收确认！',
|
|
|
+ type: 'error'
|
|
|
+ })
|
|
|
+ this.closeDialog();
|
|
|
+ } else {
|
|
|
+ this.$confirm('请再次确认 [样品接收信息]').then(_ => {
|
|
|
+
|
|
|
// 获取样品列表
|
|
|
let ypInfoList = this_.listData
|
|
|
-
|
|
|
+ // console.log(ypInfoList, "样品信息")
|
|
|
+
|
|
|
let dWhere = []
|
|
|
let ypbh = []
|
|
|
let cfwzIdList = [] // 放置 存放位置的ID
|
|
|
- // let uuidList = [] // 列表的UUID
|
|
|
let ypbhList = [] // 样品编号列表
|
|
|
-
|
|
|
+
|
|
|
// 罗湖样品编号列表
|
|
|
let lhypbhList = []
|
|
|
let lhypmcList = []
|
|
|
@@ -88,16 +107,18 @@ export default {
|
|
|
let lhypbWJ = []
|
|
|
// 罗湖委托表主键
|
|
|
let lhwtbID = []
|
|
|
+ let lhwtbOnlyId = []
|
|
|
// 罗湖委托表展示表ID
|
|
|
let lhwtzsbID = []
|
|
|
- let lhwtbOnlyId = []
|
|
|
// 罗湖样品id列表
|
|
|
let lhypIdList = []
|
|
|
// 罗湖样品id格式列表
|
|
|
let lhypIdNewList = []
|
|
|
let uuidList = [] // 列表的UUID
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
for (let yp in ypInfoList) { //样品数据
|
|
|
+ let cfwzObj = []
|
|
|
let cfwz = ''
|
|
|
/*
|
|
|
校验：
|
|
|
@@ -110,6 +131,7 @@ export default {
|
|
|
this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 接收确认数量不得大于收样数量。')
|
|
|
return;
|
|
|
}
|
|
|
+
|
|
|
if (ypInfoList[yp].jie_yang_zhuang_t == '未确认') {
|
|
|
this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 接收确认状态必须为已确认。')
|
|
|
return;
|
|
|
@@ -122,25 +144,27 @@ export default {
|
|
|
this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 是否留样不能为空!')
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
- // if (ypInfoList[yp].bao_gao_bian_zhi_ == undefined || ypInfoList[yp].bao_gao_bian_zhi_ == '') {
|
|
|
- // this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 报告编制员不能为空!')
|
|
|
- // return;
|
|
|
- // }
|
|
|
- // if (ypInfoList[yp].bao_gao_shen_he_y == undefined || ypInfoList[yp].bao_gao_shen_he_y == '') {
|
|
|
- // this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 报告审核员不能为空!')
|
|
|
- // return;
|
|
|
- // }
|
|
|
-
|
|
|
+
|
|
|
+ // if (ypInfoList[yp].bao_gao_bian_zhi_ == undefined || ypInfoList[yp].bao_gao_bian_zhi_ == '') {
|
|
|
+ // this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 报告编制员不能为空!')
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+ // if (ypInfoList[yp].bao_gao_shen_he_y == undefined || ypInfoList[yp].bao_gao_shen_he_y == '') {
|
|
|
+ // this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 报告审核员不能为空!')
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+
|
|
|
+ cfwzObj.push(ypInfoList[yp].shou_yang_wei_zhi) //取位置信息
|
|
|
+
|
|
|
if (ypInfoList[yp].shi_fou_liu_yang_ == "是") {
|
|
|
if (ypInfoList[yp].liu_yang_wei_zhi_ == null || ypInfoList[yp].liu_yang_wei_zhi_ == '') {
|
|
|
this_.$message.error("你要留样的话，存放位置不能为空哦!")
|
|
|
return;
|
|
|
}
|
|
|
- if (ypInfoList[yp].shou_yang_wei_zhi != undefined && ypInfoList[yp].shou_yang_wei_zhi != '') {
|
|
|
- this_.$message.error("你要留样的话，就不要选收样存放位置!")
|
|
|
- return;
|
|
|
- }
|
|
|
+ // if (ypInfoList[yp].shou_yang_wei_zhi != undefined && ypInfoList[yp].shou_yang_wei_zhi != '') {
|
|
|
+ // this_.$message.error("你要留样的话，就不要选收样存放位置!")
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
if (ypInfoList[yp].liu_yang_ri_qi_ == null || ypInfoList[yp].liu_yang_ri_qi_ == '') {
|
|
|
this_.$message.error("留样时必须填写留样日期!")
|
|
|
return;
|
|
|
@@ -161,377 +185,408 @@ export default {
|
|
|
this_.$message.error("留样时必须填写销毁日期!")
|
|
|
return;
|
|
|
}
|
|
|
- cfwz = ypInfoList[yp].liu_yang_wei_zhi_
|
|
|
-
|
|
|
- } else {
|
|
|
- if (ypInfoList[yp].shou_yang_wei_zhi == null || ypInfoList[yp].shou_yang_wei_zhi == '') {
|
|
|
- this_.$message.error("你正常收样的话，样品存放位置不能为空哦!")
|
|
|
- return;
|
|
|
- }
|
|
|
- if (ypInfoList[yp].liu_yang_wei_zhi_ != undefined && ypInfoList[yp].liu_yang_wei_zhi_ != '') {
|
|
|
- this_.$message.error("你正常收样的话，就不要选择留样存放位置!")
|
|
|
- return;
|
|
|
- }
|
|
|
- cfwz = ypInfoList[yp].shou_yang_wei_zhi //取位置信息
|
|
|
- }
|
|
|
+ // cfwz = ypInfoList[yp].liu_yang_wei_zhi_
|
|
|
+ cfwzObj.push(ypInfoList[yp].liu_yang_wei_zhi_)
|
|
|
+
|
|
|
+ }
|
|
|
+ // else {
|
|
|
+ // if (ypInfoList[yp].shou_yang_wei_zhi == null || ypInfoList[yp].shou_yang_wei_zhi == '') {
|
|
|
+ // this_.$message.error("你正常收样的话，样品存放位置不能为空哦!")
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+ // if (ypInfoList[yp].liu_yang_wei_zhi_ != undefined && ypInfoList[yp].liu_yang_wei_zhi_ != '') {
|
|
|
+ // this_.$message.error("你正常收样的话，就不要选择留样存放位置!")
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+ // cfwz = ypInfoList[yp].shou_yang_wei_zhi //取位置信息
|
|
|
+ // }
|
|
|
+
|
|
|
+ // uuidList.push(ypInfoList[yp].biao_zhi_uuid_)
|
|
|
// ypIdList.push('{"id_":"' + ypInfoList[yp].id_ + '"}')
|
|
|
// ypWeiZhi.push(ypInfoList[yp].shou_yang_wei_zhi) // 收样存放位置
|
|
|
// ypLiuYangWeiZhi.push(ypInfoList[yp].liu_yang_wei_zhi_) // 留样存放位置
|
|
|
// saoMaNumList.push(ypInfoList[yp].jie_yang_shu_lian) // 扫码数量
|
|
|
// jieYangQueRenZTList.push(ypInfoList[yp].jie_yang_zhuang_t) // 接收确认状态
|
|
|
ypbhList.push('{"yang_pin_bian_hao":"' + ypInfoList[yp].yang_pin_bian_hao + '"}') // 样品编号列表
|
|
|
-
|
|
|
-
|
|
|
- // 罗湖
|
|
|
- // lhypbhList.push('{"yang_pin_bian_hao":"' + ypInfoList[yp].yang_pin_bian_hao + '"}')
|
|
|
- // lhypbWJ.push('{"id_":"' + ypInfoList[yp].parent_id_ + '"}')
|
|
|
- dWhere.push('{"id_":"' + cfwz + '"}')
|
|
|
- cfwzIdList.push(cfwz)
|
|
|
- lhypbhList.push( ypInfoList[yp].yang_pin_bian_hao )
|
|
|
- lhypbWJ.push( ypInfoList[yp].parent_id_ )
|
|
|
- lhypIdList.push( ypInfoList[yp].id_ )
|
|
|
- lhypIdNewList.push('{"id_":"' + ypInfoList[yp].id_ + '"}')
|
|
|
- uuidList.push(ypInfoList[yp].biao_zhi_uuid_)
|
|
|
- ypbh.push(ypInfoList[yp].yang_pin_bian_hao)
|
|
|
- lhypmcList.push(ypInfoList[yp].yang_pin_ming_che)
|
|
|
- }
|
|
|
-
|
|
|
- /*
|
|
|
- 封装好样品登记表对象，add 样品登记表
|
|
|
- */
|
|
|
- let value = ''
|
|
|
- let lhypIdStr = ''
|
|
|
- for(let i =0;i<lhypbWJ.length; i++){
|
|
|
- value += lhypbWJ[i] + ','
|
|
|
- }
|
|
|
- value = value.substring(0,value.length-1)
|
|
|
- value = value.replace(/,/g,"','")
|
|
|
- for(let i = 0; i<lhypIdList.length;i++){
|
|
|
- lhypIdStr += lhypIdList[i] + ','
|
|
|
- }
|
|
|
- lhypIdStr = lhypIdStr.substring(0,lhypIdStr.length-1)
|
|
|
- lhypIdStr = lhypIdStr.replace(/,/g,"','")
|
|
|
-
|
|
|
- let wtdAndYpb = []
|
|
|
- // a.bao_gao_bian_zhi_,a.bao_gao_fu_he_yua,
|
|
|
- let allSQL = `select a.id_ as wtID,a.zhan_shi_biao_id_,a.wei_tuo_lei_xing_,a.he_tong_id_,a.bao_gao_lei_xing_,a.wei_tuo_bian_hao_, a.wei_tuo_dan_wei_ as wtdh, a.wei_tuo_fang_lian, a.wei_tuo_lian,a.bao_gao_bian_zhi_,a.bao_gao_fu_he_yua,b.* from t_lhwtsqb a inner join t_lhypb b on a.id_ = b.parent_id_ where b.parent_id_ in ('${value}')and b.id_ in ('${lhypIdStr}')`
|
|
|
- repostCurd('sql', allSQL).then(res1 => {
|
|
|
- /* 封装样品登记表对象 */
|
|
|
- let ypdjb = []
|
|
|
- let res = res1.variables.data
|
|
|
- wtdAndYpb = res
|
|
|
-
|
|
|
- for(let i = 0; i<res.length; i++){
|
|
|
- lhwtbID.push('{"id_":"' + res[i].wtID + '"}')
|
|
|
- lhwtbOnlyId.push(res[i].wtID)
|
|
|
- lhwtzsbID.push('{"shen_qing_id_":"' + res[i].zhan_shi_biao_id_ + '"}')
|
|
|
- let count = 0;
|
|
|
- if(res[i].yang_pin_lei_xing != '' && res[i].yang_pin_lei_xing != undefined){
|
|
|
- count = 1;
|
|
|
- if(res[i].yang_pin_lei_er_ != '' && res[i].yang_pin_lei_er_ != undefined){
|
|
|
- count = 2;
|
|
|
- if(res[i].yang_pin_lei_san_ != '' && res[i].yang_pin_lei_san_ != undefined){
|
|
|
- count = 3;
|
|
|
- if(res[i].yang_pin_lei_si_ != '' && res[i].yang_pin_lei_si_ != undefined){
|
|
|
- count = 4;
|
|
|
+
|
|
|
+
|
|
|
+ // 罗湖
|
|
|
+ // lhypbhList.push('{"yang_pin_bian_hao":"' + ypInfoList[yp].yang_pin_bian_hao + '"}')
|
|
|
+ // lhypbWJ.push('{"id_":"' + ypInfoList[yp].parent_id_ + '"}')
|
|
|
+ dWhere.push('{"id_":"' + cfwz + '"}')
|
|
|
+ cfwzIdList.push(cfwzObj)
|
|
|
+ lhypbhList.push( ypInfoList[yp].yang_pin_bian_hao )
|
|
|
+ lhypbWJ.push( ypInfoList[yp].parent_id_ )
|
|
|
+ lhypIdList.push( ypInfoList[yp].id_ )
|
|
|
+ lhypIdNewList.push('{"id_":"' + ypInfoList[yp].id_ + '"}')
|
|
|
+ uuidList.push(ypInfoList[yp].biao_zhi_uuid_)
|
|
|
+ ypbh.push(ypInfoList[yp].yang_pin_bian_hao)
|
|
|
+ lhypmcList.push(ypInfoList[yp].yang_pin_ming_che)
|
|
|
+ }
|
|
|
+
|
|
|
+ /*
|
|
|
+ 封装好样品登记表对象，add 样品登记表
|
|
|
+ */
|
|
|
+ let value = ''
|
|
|
+ let lhypIdStr = ''
|
|
|
+ for(let i =0;i<lhypbWJ.length; i++){
|
|
|
+ value += lhypbWJ[i] + ','
|
|
|
+ }
|
|
|
+ value = value.substring(0,value.length-1)
|
|
|
+ value = value.replace(/,/g,"','")
|
|
|
+ for(let i = 0; i<lhypIdList.length;i++){
|
|
|
+ lhypIdStr += lhypIdList[i] + ','
|
|
|
+ }
|
|
|
+ lhypIdStr = lhypIdStr.substring(0,lhypIdStr.length-1)
|
|
|
+ lhypIdStr = lhypIdStr.replace(/,/g,"','")
|
|
|
+
|
|
|
+ // console.log('lhypIdStr :',lhypIdStr)
|
|
|
+ let wtdAndYpb = []
|
|
|
+ // a.bao_gao_bian_zhi_,a.bao_gao_fu_he_yua,
|
|
|
+ let allSQL = `select a.id_ as wtID,a.zhan_shi_biao_id_,a.wei_tuo_lei_xing_,a.he_tong_id_,a.bao_gao_lei_xing_,a.wei_tuo_bian_hao_, a.wei_tuo_dan_wei_ as wtdh, a.wei_tuo_fang_lian, a.wei_tuo_lian,a.bao_gao_bian_zhi_,a.bao_gao_fu_he_yua,b.* from t_lhwtsqb a inner join t_lhypb b on a.id_ = b.parent_id_ where b.parent_id_ in ('${value}')and b.id_ in ('${lhypIdStr}')`
|
|
|
+ // console.log(allSQL)
|
|
|
+ repostCurd('sql', allSQL).then(res1 => {
|
|
|
+ /* 封装样品登记表对象 */
|
|
|
+ let ypdjb = []
|
|
|
+ let res = res1.variables.data
|
|
|
+ wtdAndYpb = res
|
|
|
+
|
|
|
+ for(let i = 0; i<res.length; i++){
|
|
|
+ lhwtbID.push('{"id_":"' + res[i].wtID + '"}')
|
|
|
+ lhwtbOnlyId.push(res[i].wtID)
|
|
|
+ lhwtzsbID.push('{"shen_qing_id_":"' + res[i].zhan_shi_biao_id_ + '"}')
|
|
|
+ let count = 0;
|
|
|
+ if(res[i].yang_pin_lei_xing != '' && res[i].yang_pin_lei_xing != undefined){
|
|
|
+ count = 1;
|
|
|
+ if(res[i].yang_pin_lei_er_ != '' && res[i].yang_pin_lei_er_ != undefined){
|
|
|
+ count = 2;
|
|
|
+ if(res[i].yang_pin_lei_san_ != '' && res[i].yang_pin_lei_san_ != undefined){
|
|
|
+ count = 3;
|
|
|
+ if(res[i].yang_pin_lei_si_ != '' && res[i].yang_pin_lei_si_ != undefined){
|
|
|
+ count = 4;
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- for(let x = 0; x<count;x++){
|
|
|
- let obj = {}
|
|
|
- obj["wei_tuo_dan_hao_"] = res[i].wei_tuo_bian_hao_
|
|
|
- obj["wei_tuo_dan_wei_"] = res[i].wtdh
|
|
|
- obj["lian_xi_ren_"] = res[i].wei_tuo_fang_lian
|
|
|
- obj["lian_xi_dian_hua_"] = res[i].wei_tuo_lian
|
|
|
-
|
|
|
- obj["yang_ben_ming_che"] = res[i].yang_pin_ming_che
|
|
|
- obj["yang_ben_bian_hao"] = res[i].yang_pin_bian_hao
|
|
|
- obj["pi_hao_bian_hao_"] = res[i].song_jian_pi_hao_
|
|
|
- obj["xing_ming_"] = res[i].xing_ming_
|
|
|
- obj["xing_bie_"] = res[i].xing_bie_
|
|
|
- obj["nian_ling_"] = res[i].nian_ling_
|
|
|
- obj["yang_ben_zhuang_t"] = res[i].yang_pin_zhuang_t
|
|
|
- obj["shou_yang_ri_qi_"] = this_.dateFormat()
|
|
|
- obj["bei_zhu_"] = res[i].bei_zhu_
|
|
|
-
|
|
|
- obj["yang_ben_lei_xing"] = x==0? res[i].yang_pin_lei_xing : x==1? res[i].yang_pin_lei_er_ : x==2? res[i].yang_pin_lei_san_ : x==3? res[i].yang_pin_lei_si_ :''
|
|
|
- obj["yun_shu_tiao_jian"] = x==0? res[i].yang_ben_yun_shu_ : x==1? res[i].yang_pin_yun_shu_ : x==2? res[i].yang_pin_yun_san : x==3? res[i].yang_pin_yun_si_ :''
|
|
|
- obj["yang_pin_shu_lian"] = x==0? res[i].shu_liang_ : x==1? res[i].shu_liang_er_ : x==2? res[i].shu_liang_san_ : x==3? res[i].shu_liang_si_ :''
|
|
|
- obj["yang_ben_gui_ge_s"] = x==0? res[i].yang_pin_gui_ge_ : x==1? res[i].yang_pin_gui_ge_e : x==2? res[i].yang_pin_gui_ge_s : x==3? res[i].yang_pin_gui_si_ :''
|
|
|
- obj["yan_shou_jie_guo_"] = ypInfoList[i].yan_shou_jie_guo_
|
|
|
- obj["cun_fang_wei_zhi_"] = ypInfoList[i].shou_yang_wei_zhi
|
|
|
- obj["liu_zhuan_zhuang_"] = '待检'
|
|
|
- obj["shi_fou_liu_yang_"] = ypInfoList[i].shi_fou_liu_yang_
|
|
|
- // obj["shou_yang_ren_"] = ypInfoList[i].
|
|
|
- // obj["jiao_yang_ri_qi_"] = ypInfoList[i].
|
|
|
- // obj["jiao_yang_jyr"] = ypInfoList[i].
|
|
|
- // obj["jiao_yang_shu_lia"] = ypInfoList[i].
|
|
|
- obj["liu_yang_ri_qi_"] = ypInfoList[i].liu_yang_ri_qi_
|
|
|
- obj["liu_yang_cun_fang"] = ypInfoList[i].liu_yang_cun_fang
|
|
|
- obj["liu_yang_shu_lian"] = ypInfoList[i].liu_yang_shu_lian
|
|
|
- obj["liu_yang_qi_xian"] = ypInfoList[i].liu_yang_qi_xian
|
|
|
- obj["xiao_hui_ri_qi_"] = ypInfoList[i].xiao_hui_ri_qi_
|
|
|
- obj["fan_yang_ri_qi_"] = ypInfoList[i].fan_yang_ri_qi_
|
|
|
- obj["fan_yang_jyr"] = ypInfoList[i].fan_yang_jyr
|
|
|
- obj["biao_zhi_uuid_"] = ypInfoList[i].biao_zhi_uuid_
|
|
|
- obj["song_yang_yao_qiu"] = ypInfoList[i].song_yang_yao_qiu
|
|
|
- changeWeiZhi = ypInfoList[i].shou_yang_wei_zhi ==''?'':ypInfoList[i].shou_yang_wei_zhi
|
|
|
- changesyWeiZhi = ypInfoList[i].liu_yang_cun_fang ==''?'':ypInfoList[i].liu_yang_cun_fang
|
|
|
- ypdjb.push(obj)
|
|
|
- }
|
|
|
- }
|
|
|
- let fbbIdStr = ''
|
|
|
- for(let i =0;i<lhwtbOnlyId.length; i++){
|
|
|
- fbbIdStr += lhwtbOnlyId[i] + ','
|
|
|
- }
|
|
|
- fbbIdStr = fbbIdStr.substring(0,fbbIdStr.length-1)
|
|
|
- // fbbIdStr = fbbIdStr.replace(/,/g,"','")
|
|
|
- // console.log('fbbIdStr :',fbbIdStr)
|
|
|
- // console.log('进入样品登记表...',ypdjb)
|
|
|
- repostCurd('add', '{"tableName":"t_lhypdjb","paramWhere":' + JSON.stringify(ypdjb) + '}')
|
|
|
- repostCurd('updates', '{"tableName":"t_lhypb","paramWhere":[' + lhypIdNewList + '],"paramCond":{"jie_yang_zhuang_t":"已接收"}}')
|
|
|
-
|
|
|
- /*
|
|
|
- 更新委托单 如果本来没值，就更新 报告编制人和 报告审核员 否则更新
|
|
|
- 委托单数组 和 样品数组 数量相同，遍历两者 判断委托单是否有编制人，审核员？
|
|
|
- 如果没有，则记录下委托单ID，以及同索引下的样品表的编制人和审核员
|
|
|
- */
|
|
|
- // let finalWtdIdList = []
|
|
|
-
|
|
|
- /*
|
|
|
- for(var index = 0; index < ypInfoList.length; index++){
|
|
|
- if(res[index].bao_gao_bian_zhi_ == '' || res[index].bao_gao_fu_he_yua == ''){
|
|
|
- repostCurd('update','{"tableName":"t_lhwtsqb","paramWhere":' + '{"id_":"' + res[index].wtID + '"}' + ',"paramCond":' + '{"bao_gao_bian_zhi_":"'+ypInfoList[index].bao_gao_bian_zhi_+'","bao_gao_fu_he_yua":"' + ypInfoList[index].bao_gao_shen_he_y + '"}}')
|
|
|
+ for(let x = 0; x<count;x++){
|
|
|
+ let obj = {}
|
|
|
+ obj["wei_tuo_dan_hao_"] = res[i].wei_tuo_bian_hao_
|
|
|
+ obj["wei_tuo_dan_wei_"] = res[i].wtdh
|
|
|
+ obj["lian_xi_ren_"] = res[i].wei_tuo_fang_lian
|
|
|
+ obj["lian_xi_dian_hua_"] = res[i].wei_tuo_lian
|
|
|
+
|
|
|
+ obj["yang_ben_ming_che"] = res[i].yang_pin_ming_che
|
|
|
+ obj["yang_ben_bian_hao"] = res[i].yang_pin_bian_hao
|
|
|
+ obj["pi_hao_bian_hao_"] = res[i].song_jian_pi_hao_
|
|
|
+ obj["xing_ming_"] = res[i].xing_ming_
|
|
|
+ obj["xing_bie_"] = res[i].xing_bie_
|
|
|
+ obj["nian_ling_"] = res[i].nian_ling_
|
|
|
+ obj["yang_ben_zhuang_t"] = res[i].yang_pin_zhuang_t
|
|
|
+ obj["shou_yang_ri_qi_"] = this_.dateFormat()
|
|
|
+ obj["bei_zhu_"] = ypInfoList[i].bei_zhu_
|
|
|
+
|
|
|
+ obj["yang_ben_lei_xing"] = x==0? res[i].yang_pin_lei_xing : x==1? res[i].yang_pin_lei_er_ : x==2? res[i].yang_pin_lei_san_ : x==3? res[i].yang_pin_lei_si_ :''
|
|
|
+ obj["yun_shu_tiao_jian"] = x==0? res[i].yang_ben_yun_shu_ : x==1? res[i].yang_pin_yun_shu_ : x==2? res[i].yang_pin_yun_san : x==3? res[i].yang_pin_yun_si_ :''
|
|
|
+ obj["yang_pin_shu_lian"] = x==0? res[i].shu_liang_ : x==1? res[i].shu_liang_er_ : x==2? res[i].shu_liang_san_ : x==3? res[i].shu_liang_si_ :''
|
|
|
+ obj["yang_ben_gui_ge_s"] = x==0? res[i].yang_pin_gui_ge_ : x==1? res[i].yang_pin_gui_ge_e : x==2? res[i].yang_pin_gui_ge_s : x==3? res[i].yang_pin_gui_si_ :''
|
|
|
+ obj["yan_shou_jie_guo_"] = ypInfoList[i].yan_shou_jie_guo_
|
|
|
+ obj["cun_fang_wei_zhi_"] = ypInfoList[i].shou_yang_wei_zhi
|
|
|
+ obj["liu_zhuan_zhuang_"] = '待检'
|
|
|
+ obj["shi_fou_liu_yang_"] = ypInfoList[i].shi_fou_liu_yang_
|
|
|
+ obj["liu_yang_ri_qi_"] = ypInfoList[i].liu_yang_ri_qi_
|
|
|
+ obj["liu_yang_cun_fang"] = ypInfoList[i].liu_yang_wei_zhi_
|
|
|
+ obj["liu_yang_shu_lian"] = ypInfoList[i].liu_yang_shu_lian
|
|
|
+ obj["liu_yang_qi_xian"] = ypInfoList[i].liu_yang_qi_xian
|
|
|
+ obj["xiao_hui_ri_qi_"] = ypInfoList[i].xiao_hui_ri_qi_
|
|
|
+ obj["fan_yang_ri_qi_"] = ypInfoList[i].fan_yang_ri_qi_
|
|
|
+ obj["fan_yang_jyr"] = ypInfoList[i].fan_yang_jyr
|
|
|
+ obj["biao_zhi_uuid_"] = ypInfoList[i].biao_zhi_uuid_
|
|
|
+ obj["song_yang_yao_qiu"] = ypInfoList[i].song_yang_yao_qiu
|
|
|
+ // obj["fen_zhuang_liu_ya"] = ypInfoList[i].fen_zhuang_liu_ya
|
|
|
+ changeWeiZhi = ypInfoList[i].shou_yang_wei_zhi ==''?'':ypInfoList[i].shou_yang_wei_zhi
|
|
|
+ changesyWeiZhi = ypInfoList[i].liu_yang_wei_zhi_ ==''?'':ypInfoList[i].liu_yang_wei_zhi_
|
|
|
+ ypdjb.push(obj)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ let fbbIdStr = ''
|
|
|
+ for(let i =0;i<lhwtbOnlyId.length; i++){
|
|
|
+ fbbIdStr += lhwtbOnlyId[i] + ','
|
|
|
+ }
|
|
|
+ fbbIdStr = fbbIdStr.substring(0,fbbIdStr.length-1)
|
|
|
+ // fbbIdStr = fbbIdStr.replace(/,/g,"','")
|
|
|
+ // console.log('fbbIdStr :',fbbIdStr)
|
|
|
+ // console.log('进入样品登记表...',ypdjb)
|
|
|
+ repostCurd('add', '{"tableName":"t_lhypdjb","paramWhere":' + JSON.stringify(ypdjb) + '}')
|
|
|
+ repostCurd('updates', '{"tableName":"t_lhypb","paramWhere":[' + lhypIdNewList + '],"paramCond":{"jie_yang_zhuang_t":"已接收"}}')
|
|
|
+
|
|
|
+ /*
|
|
|
+ 更新委托单 如果本来没值，就更新 报告编制人和 报告审核员 否则更新
|
|
|
+ 委托单数组 和 样品数组 数量相同，遍历两者 判断委托单是否有编制人，审核员？
|
|
|
+ 如果没有，则记录下委托单ID，以及同索引下的样品表的编制人和审核员
|
|
|
+ */
|
|
|
+ // let finalWtdIdList = []
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 1.11胡老师说不要
|
|
|
+
|
|
|
+ for(var index = 0; index < ypInfoList.length; index++){
|
|
|
+ if(res[index].bao_gao_bian_zhi_ == '' || res[index].bao_gao_fu_he_yua == ''){
|
|
|
+ repostCurd('update','{"tableName":"t_lhwtsqb","paramWhere":' + '{"id_":"' + res[index].wtID + '"}' + ',"paramCond":' + '{"bao_gao_bian_zhi_":"'+ypInfoList[index].bao_gao_bian_zhi_+'","bao_gao_fu_he_yua":"' + ypInfoList[index].bao_gao_shen_he_y + '"}}')
|
|
|
+ }
|
|
|
}
|
|
|
- }*/
|
|
|
- /*
|
|
|
- let wtdSQL = "select id_,bao_gao_bian_zhi_,bao_gao_fu_he_yua from t_lhwtsqb where id_ in('" + value + "')"
|
|
|
-
|
|
|
- repostCurd('sql', wtdSQL).then(response => {
|
|
|
- let result = response.variables.data
|
|
|
- console.log(result)
|
|
|
- for(var i in result){
|
|
|
- if(result[i].bao_gao_bian_zhi_ == '' || result[i].bao_gao_bian_zhi_ == undefined){
|
|
|
- finalWtdIdList.push(result[i])
|
|
|
- }
|
|
|
- }
|
|
|
- console.log('finalWtdIdList',finalWtdIdList)
|
|
|
- })
|
|
|
- 3、任务分配 【2022/11/23 取消 直接 批量开检测子流程】
|
|
|
- 3-1、根据 wtdAndYpb 的 wtID 更改委托表的 委托状态 wei_tuo_zhuang_ta 变成 已完成
|
|
|
- 3-2、根据每个样品对应的检测项目，开启一个或多个任务 / 遍历样品表开任务分配流程，一个样品可能对应多个检测
|
|
|
- 3-3、委托表找zhan_shi_biao_id_ 修改 t_lhwtzsb "zhuang_tai_"为"任务分配进行中"
|
|
|
-*/
|
|
|
- // console.log('委托单及样品信息',wtdAndYpb)
|
|
|
- // console.log('委托单id列表 ',lhwtbID)
|
|
|
- // console.log('展示表id列表 ',lhwtzsbID)
|
|
|
-
|
|
|
- repostCurd('updates', '{"tableName":"t_lhwtsqb","paramWhere":[' + lhwtbID + '],"paramCond":{"wei_tuo_zhuang_ta":"已完成"}}')
|
|
|
-
|
|
|
- let rws = []
|
|
|
- if(wtdAndYpb.length>0){
|
|
|
- for(var i in wtdAndYpb){
|
|
|
- // let strs = wtdAndYpb[i].jian_ce_xiang_mu_.split(',')
|
|
|
- // for(var l in strs){
|
|
|
- let rw = {}
|
|
|
- // rw["ren_wu_ming_cheng"] = strs[l] //检测项目
|
|
|
- rw["yang_pin_ming_che"] = wtdAndYpb[i].yang_pin_ming_che//样品名称
|
|
|
- rw["yang_pin_bian_hao"] = wtdAndYpb[i].yang_pin_bian_hao//样品编号
|
|
|
- rw["wei_tuo_lei_xing_"] = wtdAndYpb[i].wei_tuo_lei_xing_ //委托类型
|
|
|
- let yplxz = ''
|
|
|
- if(wtdAndYpb[i].yang_pin_lei_xing != null && wtdAndYpb[i].yang_pin_lei_xing!=''){ //样品类型1
|
|
|
- yplxz = wtdAndYpb[i].yang_pin_lei_xing //样品类型
|
|
|
- }
|
|
|
- if(wtdAndYpb[i].yang_pin_lei_er_ != null && wtdAndYpb[i].yang_pin_lei_er_!=''){ //样品类型2
|
|
|
- if(yplxz==null || yplxz == ''){
|
|
|
- yplxz = wtdAndYpb[i].yang_pin_lei_er_ //样品类型
|
|
|
- }else{
|
|
|
- yplxz =yplxz+','+ wtdAndYpb[i].yang_pin_lei_er_ //样品类型
|
|
|
+ */
|
|
|
+
|
|
|
+ /*
|
|
|
+ let wtdSQL = "select id_,bao_gao_bian_zhi_,bao_gao_fu_he_yua from t_lhwtsqb where id_ in('" + value + "')"
|
|
|
+
|
|
|
+ repostCurd('sql', wtdSQL).then(response => {
|
|
|
+ let result = response.variables.data
|
|
|
+ console.log(result)
|
|
|
+ for(var i in result){
|
|
|
+ if(result[i].bao_gao_bian_zhi_ == '' || result[i].bao_gao_bian_zhi_ == undefined){
|
|
|
+ finalWtdIdList.push(result[i])
|
|
|
+ }
|
|
|
+ }
|
|
|
+ console.log('finalWtdIdList',finalWtdIdList)
|
|
|
+ })
|
|
|
+ */
|
|
|
+
|
|
|
+ /*
|
|
|
+ 3、任务分配 【2022/11/23 取消 直接 批量开检测子流程】【2022/11/30 胡老师又要】
|
|
|
+ 3-1、根据 wtdAndYpb 的 wtID 更改委托表的 委托状态 wei_tuo_zhuang_ta 变成 已完成
|
|
|
+ 3-2、根据每个样品一个任务分配流程 遍历样品表开任务分配流程
|
|
|
+ 3-3、委托表找zhan_shi_biao_id_ 修改 t_lhwtzsb "zhuang_tai_"为"待任务分配"
|
|
|
+ */
|
|
|
+ // console.log('委托单及样品信息',wtdAndYpb)
|
|
|
+ // console.log('委托单id列表 ',lhwtbID)
|
|
|
+ // console.log('展示表id列表 ',lhwtzsbID)
|
|
|
+
|
|
|
+ repostCurd('updates', '{"tableName":"t_lhwtsqb","paramWhere":[' + lhwtbID + '],"paramCond":{"wei_tuo_zhuang_ta":"已完成"}}')
|
|
|
+
|
|
|
+ let rws = []
|
|
|
+ if(wtdAndYpb.length>0){
|
|
|
+ for(var i in wtdAndYpb){
|
|
|
+ // let strs = wtdAndYpb[i].jian_ce_xiang_mu_.split(',')
|
|
|
+ // for(var l in strs){
|
|
|
+ let rw = {}
|
|
|
+ // rw["ren_wu_ming_cheng"] = strs[l] //检测项目
|
|
|
+ rw["yang_pin_ming_che"] = wtdAndYpb[i].yang_pin_ming_che//样品名称
|
|
|
+ rw["yang_pin_bian_hao"] = wtdAndYpb[i].yang_pin_bian_hao//样品编号
|
|
|
+ rw["wei_tuo_lei_xing_"] = wtdAndYpb[i].wei_tuo_lei_xing_ //委托类型
|
|
|
+ let yplxz = ''
|
|
|
+ if(wtdAndYpb[i].yang_pin_lei_xing != null && wtdAndYpb[i].yang_pin_lei_xing!=''){ //样品类型1
|
|
|
+ yplxz = wtdAndYpb[i].yang_pin_lei_xing //样品类型
|
|
|
}
|
|
|
- }
|
|
|
- if(wtdAndYpb[i].yang_pin_lei_san_ != null && wtdAndYpb[i].yang_pin_lei_san_!=''){ //样品类型3
|
|
|
- if(yplxz==null || yplxz == ''){
|
|
|
- yplxz = wtdAndYpb[i].yang_pin_lei_san_ //样品类型
|
|
|
- }else{
|
|
|
- yplxz =yplxz+','+ wtdAndYpb[i].yang_pin_lei_san_ //样品类型
|
|
|
+ if(wtdAndYpb[i].yang_pin_lei_er_ != null && wtdAndYpb[i].yang_pin_lei_er_!=''){ //样品类型2
|
|
|
+ if(yplxz==null || yplxz == ''){
|
|
|
+ yplxz = wtdAndYpb[i].yang_pin_lei_er_ //样品类型
|
|
|
+ }else{
|
|
|
+ yplxz =yplxz+','+ wtdAndYpb[i].yang_pin_lei_er_ //样品类型
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- if(wtdAndYpb[i].yang_pin_lei_si_ != null && wtdAndYpb[i].yang_pin_lei_si_!=''){ //样品类型4
|
|
|
- if(yplxz==null || yplxz == ''){
|
|
|
- yplxz = wtdAndYpb[i].yang_pin_lei_si_ //样品类型
|
|
|
- }else{
|
|
|
- yplxz = yplxz+','+ wtdAndYpb[i].yang_pin_lei_si_ //样品类型
|
|
|
+ if(wtdAndYpb[i].yang_pin_lei_san_ != null && wtdAndYpb[i].yang_pin_lei_san_!=''){ //样品类型3
|
|
|
+ if(yplxz==null || yplxz == ''){
|
|
|
+ yplxz = wtdAndYpb[i].yang_pin_lei_san_ //样品类型
|
|
|
+ }else{
|
|
|
+ yplxz =yplxz+','+ wtdAndYpb[i].yang_pin_lei_san_ //样品类型
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- rw["yang_pin_lei_xing"] = yplxz //样品类型
|
|
|
- rw["wei_tuo_id_"] = wtdAndYpb[i].wtID //委托id
|
|
|
- rw["he_tong_id_"] = wtdAndYpb[i].he_tong_id_ //合同id
|
|
|
- rw["zhuang_tai_"] = '待任务分配'//状态
|
|
|
- rw["wan_cheng_shi_jia"] = wtdAndYpb[i].song_jian_shi_jia //送检日期
|
|
|
- // rw["bao_gao_bian_zhi_"] = ypInfoList[i].bao_gao_bian_zhi_ //报告编制人
|
|
|
- // rw["bao_gao_shen_he_y"] = ypInfoList[i].bao_gao_shen_he_y //报告审核人
|
|
|
- rw["bao_gao_lei_xing_"] = wtdAndYpb[i].bao_gao_lei_xing_ //报告类型
|
|
|
- rw["xin_xiang_mu_ming"] = wtdAndYpb[i].xiang_mu_ming_che //项目名称
|
|
|
- rw["zhan_shi_biao_id_"] = wtdAndYpb[i].zhan_shi_biao_id_ //展示表id
|
|
|
- rws.push(rw)
|
|
|
- // }
|
|
|
+ if(wtdAndYpb[i].yang_pin_lei_si_ != null && wtdAndYpb[i].yang_pin_lei_si_!=''){ //样品类型4
|
|
|
+ if(yplxz==null || yplxz == ''){
|
|
|
+ yplxz = wtdAndYpb[i].yang_pin_lei_si_ //样品类型
|
|
|
+ }else{
|
|
|
+ yplxz = yplxz+','+ wtdAndYpb[i].yang_pin_lei_si_ //样品类型
|
|
|
+ }
|
|
|
+ }
|
|
|
+ rw["yang_pin_lei_xing"] = yplxz // 样品类型
|
|
|
+ rw["wei_tuo_id_"] = wtdAndYpb[i].wtID // 委托id
|
|
|
+ rw["he_tong_id_"] = wtdAndYpb[i].he_tong_id_ // 合同id
|
|
|
+ rw["zhuang_tai_"] = '待任务分配' // 状态
|
|
|
+ rw["wan_cheng_shi_jia"] = wtdAndYpb[i].song_jian_shi_jia // 送检日期
|
|
|
+ // rw["bao_gao_bian_zhi_"] = ypInfoList[i].bao_gao_bian_zhi_ // 报告编制人
|
|
|
+ // rw["bao_gao_shen_he_y"] = ypInfoList[i].bao_gao_shen_he_y // 报告审核人
|
|
|
+ rw["bao_gao_lei_xing_"] = wtdAndYpb[i].bao_gao_lei_xing_ // 报告类型
|
|
|
+ rw["xin_xiang_mu_ming"] = wtdAndYpb[i].xiang_mu_ming_che // 项目名称
|
|
|
+ rw["zhan_shi_biao_id_"] = wtdAndYpb[i].zhan_shi_biao_id_ // 展示表id
|
|
|
+ rw["fen_zhuang_liu_ya"] = ypInfoList[i].liu_yang_shu_lian // 留样数量
|
|
|
+ rws.push(rw)
|
|
|
+ // }
|
|
|
+ }
|
|
|
+ // console.log("任务分配",rws)
|
|
|
+ repostCurd('add', '{"tableName":"t_lhrwfpb","paramWhere":'+JSON.stringify(rws)+',"defKey":"Process_04o0csc","formKey":"lhrwfp"}')
|
|
|
}
|
|
|
- // console.log("任务分配",rws)
|
|
|
- repostCurd('add', '{"tableName":"t_lhrwfpb","paramWhere":'+JSON.stringify(rws)+',"defKey":"Process_04o0csc","formKey":"lhrwfp"}')
|
|
|
- }
|
|
|
- // 更新委托单 检测开始时间 问吴懿是否需要
|
|
|
- //repostCurd('updates', '{"tableName":"t_lhwtsqb","paramWhere":[' + lhwtbID + '],"paramCond":{"jian_ce_kai_shi_s":"' + this_.dateFormat() + '"}}')
|
|
|
-
|
|
|
- //更新展示表
|
|
|
- if(lhwtzsbID.length > 0){
|
|
|
- repostCurd('updates', '{"tableName":"t_lhwtzsb","paramWhere":['+lhwtzsbID+'],"paramCond":{"zhuang_tai_":"任务分配进行中"}}')
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- /*
|
|
|
- 3、【任务分配2022/11/23 取消 直接 批量开检测子流程】
|
|
|
- 3-1、根据 wtdAndYpb 的 wtID 更改委托表的 委托状态 wei_tuo_zhuang_ta 变成 已完成
|
|
|
- 3-2、根据每个样品对应的检测项目，开启一个或多个任务 / 遍历样品表开检测子流程，一个样品可能对应多个检测
|
|
|
- 3-3、委托表找zhan_shi_biao_id_ 修改 t_lhwtzsb "zhuang_tai_"为"待环境监控"
|
|
|
-
|
|
|
-
|
|
|
- repostCurd('updates', '{"tableName":"t_lhwtsqb","paramWhere":[' + lhwtbID + '],"paramCond":{"wei_tuo_zhuang_ta":"已完成"}}')
|
|
|
-*/
|
|
|
-// console.log('dWhere : ',dWhere)
|
|
|
-
|
|
|
- /* 2、更新货架位置信息（位置状态、样品编号、入库时间）如果是重复位置，则新增一条位置记录，并增加对应UUID */
|
|
|
- for (let num in dWhere) {
|
|
|
- let sql = "select * from t_ypcfwz where id_ = '" + cfwzIdList[num] + "'"
|
|
|
- repostCurd('sql', sql).then(response => {
|
|
|
- let resArr = response.variables.data
|
|
|
- if (resArr.length == 1) {
|
|
|
- if (resArr[0].wei_zhi_zhuang_ta == "空余") {
|
|
|
- repostCurd('update', '{"tableName":"t_ypcfwz","paramWhere":' + dWhere[num] + ',"paramCond":' + '{"wei_zhi_zhuang_ta":"占用","yang_pin_bian_hao":"' + ypbh[num] +'","yang_pin_ming_che":"' + lhypmcList[num] +'","ru_ku_shi_jian_":"' + this_.dateFormat() + '"}}').then(res => {
|
|
|
- // console.log("原本位置为空余 ，新位置更新成功")
|
|
|
- })
|
|
|
- } else if (resArr[0].wei_zhi_zhuang_ta == "占用") {
|
|
|
- // 新增一条新的位置记录,使用旧的位置记录 修改它的样品编号，入库时间，标识UUID
|
|
|
- let cfNewList = []
|
|
|
- let cfNew = {}
|
|
|
- cfNew["fang_jian_lei_xin"] = resArr[0].fang_jian_lei_xin
|
|
|
- cfNew["wei_zhi_"] = resArr[0].wei_zhi_
|
|
|
- cfNew["qu_yu_"] = resArr[0].qu_yu_
|
|
|
- cfNew["huo_jia_lei_xing_"] = resArr[0].huo_jia_lei_xing_
|
|
|
- cfNew["huo_jia_hao_"] = resArr[0].huo_jia_hao_
|
|
|
- cfNew["ceng_hao_"] = resArr[0].ceng_hao_
|
|
|
- cfNew["shui_ping_fen_qu_"] = resArr[0].shui_ping_fen_qu_
|
|
|
- cfNew["wei_zhi_bian_hao_"] = resArr[0].wei_zhi_bian_hao_
|
|
|
- cfNew["wei_zhi_zhuang_ta"] = resArr[0].wei_zhi_zhuang_ta
|
|
|
- cfNew["cun_chu_tiao_jian"] = resArr[0].cun_chu_tiao_jian
|
|
|
- cfNew["yang_pin_bian_hao"] = ypbh[num]
|
|
|
- // cfNew["yang_pin_bian_hao"] = lhypIdList[num]
|
|
|
- cfNew["yang_pin_ming_che"] = lhypmcList[num]
|
|
|
- cfNew["ru_ku_shi_jian_"] = this_.dateFormat()
|
|
|
- cfNew["biao_zhi_uuid_"] = uuidList[num]
|
|
|
- cfNewList.push(cfNew)
|
|
|
- let uuid = cfNew["biao_zhi_uuid_"];
|
|
|
- // console.log('原本位置为占用 ，新位置插入成功')
|
|
|
-
|
|
|
- repostCurd('add', '{"tableName":"t_ypcfwz","paramWhere":' + JSON.stringify(cfNewList) + '}').then(res => {
|
|
|
- let selectsql = "select id_ from t_ypcfwz where biao_zhi_uuid_='" + uuid + "'";
|
|
|
- // console.log(selectsql)
|
|
|
- repostCurd('sql', selectsql).then(res => {
|
|
|
- // console.log(res)
|
|
|
- let dataid = res.variables.data[0].id_;
|
|
|
- let abc = '{"biao_zhi_uuid_":"' + uuid + '"}'
|
|
|
- // console.log('zzj abc ',abc)
|
|
|
- // console.log('zzj dataid ',dataid)
|
|
|
- if (changeWeiZhi && !changesyWeiZhi) {
|
|
|
- repostCurd('update', '{"tableName":"t_lhypdjb","paramWhere":' + abc + ',"paramCond":' + '{"cun_fang_wei_zhi_":"' + dataid + '"}}').then(res => {
|
|
|
- // console.log('回填样品收样位置')
|
|
|
+ // 更新委托单 检测开始时间 问吴懿是否需要 不需要
|
|
|
+ // repostCurd('updates', '{"tableName":"t_lhwtsqb","paramWhere":[' + lhwtbID + '],"paramCond":{"jian_ce_kai_shi_s":"' + this_.dateFormat() + '"}}')
|
|
|
+
|
|
|
+ //更新展示表
|
|
|
+ if(lhwtzsbID.length > 0){
|
|
|
+ repostCurd('updates', '{"tableName":"t_lhwtzsb","paramWhere":['+lhwtzsbID+'],"paramCond":{"zhuang_tai_":"任务分配进行中"}}')
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ /*
|
|
|
+ 3、【任务分配2022/11/23 取消 直接 批量开检测子流程】【2022/11/30 取消】
|
|
|
+ 3-1、根据 wtdAndYpb 的 wtID 更改委托表的 委托状态 wei_tuo_zhuang_ta 变成 已完成
|
|
|
+ 3-2、根据每个样品对应的检测项目，开启一个或多个任务 / 遍历样品表开检测子流程，一个样品可能对应多个检测
|
|
|
+ 3-3、委托表找zhan_shi_biao_id_ 修改 t_lhwtzsb "zhuang_tai_"为"待环境监控"
|
|
|
+
|
|
|
+ repostCurd('updates', '{"tableName":"t_lhwtsqb","paramWhere":[' + lhwtbID + '],"paramCond":{"wei_tuo_zhuang_ta":"已完成"}}')
|
|
|
+ */
|
|
|
+
|
|
|
+ // console.log('dwhere:',dWhere)
|
|
|
+ // console.log('cfwzIdList:',cfwzIdList)
|
|
|
+ /* 2、更新货架位置信息（位置状态、样品编号、入库时间）如果是重复位置，则新增一条位置记录，并增加对应UUID */
|
|
|
+ for (let num in dWhere) {
|
|
|
+ let firstIfEmpty = true
|
|
|
+ let secondIfEmpty = true
|
|
|
+ for(let index = 0; index<cfwzIdList[num].length; index++){
|
|
|
+ let sql = "select * from t_ypcfwz where id_ = '" + cfwzIdList[num][index] + "'"
|
|
|
+ // console.log(sql)
|
|
|
+ repostCurd('sql', sql).then(response => {
|
|
|
+ let resArr = response.variables.data
|
|
|
+ // console.log(resArr)
|
|
|
+ if (resArr.length == 1) {
|
|
|
+ if (resArr[0].wei_zhi_zhuang_ta == "空余") {
|
|
|
+ if(index == 0){
|
|
|
+ firstIfEmpty = false
|
|
|
+ }else{
|
|
|
+ secondIfEmpty = false
|
|
|
+ }
|
|
|
+ let content = '{"id_":"' + cfwzIdList[num][index] + '"}'
|
|
|
+ repostCurd('update',
|
|
|
+ '{"tableName":"t_ypcfwz","paramWhere":'+content+',"paramCond":{"wei_zhi_zhuang_ta":"占用","ru_ku_shi_jian_":"'+this_.dateFormat()+'","yang_pin_bian_hao":"'+ypbh[num]+'","yang_pin_ming_che":"'+lhypmcList[num]+'"}}').then(res=>{
|
|
|
+ console.log('空余')
|
|
|
})
|
|
|
- } else {
|
|
|
- repostCurd('update', '{"tableName":"t_lhypdjb","paramWhere":' + abc + ',"paramCond":' + '{"liu_yang_cun_fang":"' + dataid + '"}}').then(res => {
|
|
|
- // console.log('回填样品留样位置')
|
|
|
+ } else if (resArr[0].wei_zhi_zhuang_ta == "占用") {
|
|
|
+ // 新增一条新的位置记录,使用旧的位置记录 修改它的样品编号，入库时间，标识UUID
|
|
|
+ let cfNewList = []
|
|
|
+ let cfNew = {}
|
|
|
+ cfNew["fang_jian_lei_xin"] = resArr[0].fang_jian_lei_xin
|
|
|
+ cfNew["wei_zhi_"] = resArr[0].wei_zhi_
|
|
|
+ cfNew["qu_yu_"] = resArr[0].qu_yu_
|
|
|
+ cfNew["huo_jia_lei_xing_"] = resArr[0].huo_jia_lei_xing_
|
|
|
+ cfNew["huo_jia_hao_"] = resArr[0].huo_jia_hao_
|
|
|
+ cfNew["ceng_hao_"] = resArr[0].ceng_hao_
|
|
|
+ cfNew["shui_ping_fen_qu_"] = resArr[0].shui_ping_fen_qu_
|
|
|
+ cfNew["wei_zhi_bian_hao_"] = resArr[0].wei_zhi_bian_hao_
|
|
|
+ cfNew["wei_zhi_zhuang_ta"] = resArr[0].wei_zhi_zhuang_ta
|
|
|
+ cfNew["cun_chu_tiao_jian"] = resArr[0].cun_chu_tiao_jian
|
|
|
+ cfNew["yang_pin_bian_hao"] = ypbh[num]
|
|
|
+ cfNew["shi_fou_guo_shen_"] = '启用'
|
|
|
+ // cfNew["yang_pin_bian_hao"] = lhypIdList[num]
|
|
|
+ cfNew["yang_pin_ming_che"] = lhypmcList[num]
|
|
|
+ cfNew["ru_ku_shi_jian_"] = this_.dateFormat()
|
|
|
+ cfNew["biao_zhi_uuid_"] = uuidList[num]
|
|
|
+ cfNewList.push(cfNew)
|
|
|
+ let uuid = cfNew["biao_zhi_uuid_"];
|
|
|
+ // console.log('货位：',cfNewList)
|
|
|
+
|
|
|
+
|
|
|
+ repostCurd('add', '{"tableName":"t_ypcfwz","paramWhere":' + JSON.stringify(cfNewList) + '}').then(res => {
|
|
|
+ let selectsql = "select id_ from t_ypcfwz where biao_zhi_uuid_='" + uuid + "'";
|
|
|
+ repostCurd('sql', selectsql).then(res => {
|
|
|
+ // let dataid = res.variables.data[0].id_;
|
|
|
+ let data = res.variables.data;
|
|
|
+ // console.log('data:',data)
|
|
|
+ let suchAs = '{"biao_zhi_uuid_":"' + uuid + '"}'
|
|
|
+ // console.log(data.length,changeWeiZhi,changesyWeiZhi,firstIfEmpty,secondIfEmpty)
|
|
|
+ if(data.length == 1 && changeWeiZhi && firstIfEmpty){
|
|
|
+ repostCurd('update', '{"tableName":"t_lhypdjb","paramWhere":'+suchAs+',"paramCond":{"cun_fang_wei_zhi_":"'+data[0].id_+'"}}').then(res=>{
|
|
|
+ console.log('One 存放位置',res)
|
|
|
+ })
|
|
|
+ }else if(data.length == 1 && changesyWeiZhi && secondIfEmpty){
|
|
|
+ repostCurd('update', '{"tableName":"t_lhypdjb","paramWhere":'+suchAs+',"paramCond":{"liu_yang_cun_fang":"'+data[0].id_+'"}}').then(res=>{
|
|
|
+ console.log('One 留样位置',res)
|
|
|
+ })
|
|
|
+ }else if(data.length == 2 && changeWeiZhi && changesyWeiZhi){
|
|
|
+ let whereL = []
|
|
|
+ whereL.push(suchAs)
|
|
|
+ repostCurd('updates', '{"tableName":"t_lhypdjb","paramWhere":['+whereL+'],"paramCond":{"cun_fang_wei_zhi_":"'+data[0].id_+'","liu_yang_cun_fang":"'+data[1].id_+'"}}').then(res=>{
|
|
|
+ console.log('Two 收样留样位置',res)
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
})
|
|
|
}
|
|
|
- })
|
|
|
-
|
|
|
+ }
|
|
|
})
|
|
|
- }
|
|
|
}
|
|
|
- })
|
|
|
- }
|
|
|
-/*
|
|
|
- let ffbSql = "select * from t_lhfbb where FIND_IN_SET( parent_id_,'"+ fbbIdStr +"')"
|
|
|
- repostCurd('sql',ffbSql).then(response => {
|
|
|
- let ffbList = response.variables.data
|
|
|
- if(wtdAndYpb.length>0){
|
|
|
- let jcxmArr = []
|
|
|
- wtdAndYpb.forEach(item=>{
|
|
|
- item.jian_ce_xiang_mu_.split(',').reverse().forEach(temp=>{
|
|
|
- jcxmArr.push(temp)
|
|
|
+ }
|
|
|
+
|
|
|
+ /*
|
|
|
+ let ffbSql = "select * from t_lhfbb where FIND_IN_SET( parent_id_,'"+ fbbIdStr +"')"
|
|
|
+ repostCurd('sql',ffbSql).then(response => {
|
|
|
+ let ffbList = response.variables.data
|
|
|
+ if(wtdAndYpb.length>0){
|
|
|
+ let jcxmArr = []
|
|
|
+ wtdAndYpb.forEach(item=>{
|
|
|
+ item.jian_ce_xiang_mu_.split(',').reverse().forEach(temp=>{
|
|
|
+ jcxmArr.push(temp)
|
|
|
+ })
|
|
|
})
|
|
|
- })
|
|
|
-
|
|
|
- let allProject = []
|
|
|
- let finalJCTask = []
|
|
|
- let processDefKeyParam = []
|
|
|
- let processFormKeyParam = []
|
|
|
- let sql111 = `select id_, defkey_, formkey_ from t_mjjcnlfw where defkey_ != '' and find_in_set(id_, '${jcxmArr.join(',')}')`
|
|
|
- repostCurd('sql', sql111).then(res => {
|
|
|
- allProject = res.variables.data
|
|
|
- wtdAndYpb.forEach(item => {
|
|
|
- let yblxArr = []
|
|
|
- let yblxStr = ''
|
|
|
- yblxArr.push(item.yang_pin_lei_xing, item.yang_pin_lei_er_, item.yang_pin_lei_san_, item.yang_pin_lei_si_)
|
|
|
- yblxStr = yblxArr.filter(s => s).join(',')
|
|
|
- let t = item.jian_ce_xiang_mu_.split(',')
|
|
|
- let ypList = ypInfoList.find(k => k.id_ === item.id_)
|
|
|
- t.forEach(i => {
|
|
|
- let fbbItem = ffbList.find(j => j.jian_ce_xiang_mu_ === i)
|
|
|
- let jcxmItem = allProject.find(k => k.id_ === i)
|
|
|
- let obj = {
|
|
|
- jian_ce_yuan_: fbbItem.jian_ce_yuan_,
|
|
|
- fu_he_yuan_ : fbbItem.fu_he_yuan_,
|
|
|
- yang_pin_ming_che: item.yang_pin_ming_che,
|
|
|
- yang_pin_bian_hao: item.yang_pin_bian_hao,
|
|
|
- jian_ce_xiang_mu_:jcxmItem.id_,
|
|
|
- wei_tuo_id_:item.wtID,
|
|
|
- he_tong_id_:item.he_tong_id_,
|
|
|
- bao_gao_bian_zhi_:ypList.bao_gao_bian_zhi_,
|
|
|
- bao_gao_fu_he_yua:ypList.bao_gao_shen_he_y,
|
|
|
- wei_tuo_lei_xing_:item.wei_tuo_lei_xing_,
|
|
|
- yang_pin_lei_xing: yblxStr,
|
|
|
- xin_xiang_mu_ming:item.xiang_mu_ming_che,
|
|
|
- wan_cheng_shi_jia:item.song_jian_shi_jia,
|
|
|
- zhuang_tai_:'待环境监控',
|
|
|
- zhan_shi_biao_id_:item.zhan_shi_biao_id_
|
|
|
- }
|
|
|
- finalJCTask.push(obj)
|
|
|
- processDefKeyParam.push(jcxmItem.defkey_)
|
|
|
- processFormKeyParam.push(jcxmItem.formkey_)
|
|
|
+ let allProject = []
|
|
|
+ let finalJCTask = []
|
|
|
+ let processDefKeyParam = []
|
|
|
+ let processFormKeyParam = []
|
|
|
+ let sql111 = `select id_, defkey_, formkey_ from t_mjjcnlfw where defkey_ != '' and find_in_set(id_, '${jcxmArr.join(',')}')`
|
|
|
+ repostCurd('sql', sql111).then(res => {
|
|
|
+ allProject = res.variables.data
|
|
|
+ wtdAndYpb.forEach(item => {
|
|
|
+ let yblxArr = []
|
|
|
+ let yblxStr = ''
|
|
|
+ yblxArr.push(item.yang_pin_lei_xing, item.yang_pin_lei_er_, item.yang_pin_lei_san_, item.yang_pin_lei_si_)
|
|
|
+ yblxStr = yblxArr.filter(s => s).join(',')
|
|
|
+ let t = item.jian_ce_xiang_mu_.split(',')
|
|
|
+ let ypList = ypInfoList.find(k => k.id_ === item.id_)
|
|
|
+ t.forEach(i => {
|
|
|
+ let fbbItem = ffbList.find(j => j.jian_ce_xiang_mu_ === i)
|
|
|
+ let jcxmItem = allProject.find(k => k.id_ === i)
|
|
|
+ let obj = {
|
|
|
+ jian_ce_yuan_: fbbItem.jian_ce_yuan_,
|
|
|
+ fu_he_yuan_ : fbbItem.fu_he_yuan_,
|
|
|
+ yang_pin_ming_che: item.yang_pin_ming_che,
|
|
|
+ yang_pin_bian_hao: item.yang_pin_bian_hao,
|
|
|
+ jian_ce_xiang_mu_:jcxmItem.id_,
|
|
|
+ wei_tuo_id_:item.wtID,
|
|
|
+ he_tong_id_:item.he_tong_id_,
|
|
|
+ bao_gao_bian_zhi_:ypList.bao_gao_bian_zhi_,
|
|
|
+ bao_gao_fu_he_yua:ypList.bao_gao_shen_he_y,
|
|
|
+ wei_tuo_lei_xing_:item.wei_tuo_lei_xing_,
|
|
|
+ yang_pin_lei_xing: yblxStr,
|
|
|
+ xin_xiang_mu_ming:item.xiang_mu_ming_che,
|
|
|
+ wan_cheng_shi_jia:item.song_jian_shi_jia,
|
|
|
+ zhuang_tai_:'待环境监控',
|
|
|
+ zhan_shi_biao_id_:item.zhan_shi_biao_id_
|
|
|
+ }
|
|
|
+ finalJCTask.push(obj)
|
|
|
+ processDefKeyParam.push(jcxmItem.defkey_)
|
|
|
+ processFormKeyParam.push(jcxmItem.formkey_)
|
|
|
+ })
|
|
|
})
|
|
|
- })
|
|
|
-
|
|
|
-
|
|
|
- finalJCTask.forEach((item,index )=>{
|
|
|
- let obj = {
|
|
|
- tableName:"t_lhjczb",
|
|
|
- paramWhere:[item],
|
|
|
- defKey:processDefKeyParam[index],
|
|
|
- formKey:processFormKeyParam[index]
|
|
|
- }
|
|
|
- repostCurd('add', JSON.stringify(obj))
|
|
|
- })
|
|
|
- })
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- })
|
|
|
-
|
|
|
- //更新展示表
|
|
|
- if(lhwtzsbID.length > 0){
|
|
|
- repostCurd('updates', '{"tableName":"t_lhwtzsb","paramWhere":['+lhwtzsbID+'],"paramCond":{"zhuang_tai_":"检测进行中"}}')
|
|
|
- }
|
|
|
-*/
|
|
|
+ finalJCTask.forEach((item,index )=>{
|
|
|
+ let obj = {
|
|
|
+ tableName:"t_lhjczb",
|
|
|
+ paramWhere:[item],
|
|
|
+ defKey:processDefKeyParam[index],
|
|
|
+ formKey:processFormKeyParam[index]
|
|
|
+ }
|
|
|
+ repostCurd('add', JSON.stringify(obj))
|
|
|
+ })
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ //更新展示表
|
|
|
+ if(lhwtzsbID.length > 0){
|
|
|
+ repostCurd('updates', '{"tableName":"t_lhwtzsb","paramWhere":['+lhwtzsbID+'],"paramCond":{"zhuang_tai_":"检测进行中"}}')
|
|
|
+ }
|
|
|
+ */
|
|
|
})
|
|
|
+
|
|
|
+
|
|
|
this.$emit('callback', true)
|
|
|
this.visable = false
|
|
|
this.$message({
|
|
|
@@ -540,7 +595,9 @@ export default {
|
|
|
})
|
|
|
this.closeDialog();
|
|
|
}).catch(_ => {});
|
|
|
- },
|
|
|
+ }
|
|
|
+
|
|
|
+ },
|
|
|
/* 去除指定行数据 使用过滤器filter过滤指定行号数据 */
|
|
|
deleteData(val){
|
|
|
this.listData = this.listData.filter((data) =>{
|
ZZJ