fix sql

src/views/system/jbdScan/goods/manualConfirmation.vue

@@ -844,13 +844,14 @@ import * as dayjs from 'dayjs'
     liuyanChange(item,index){
       // console.log(item,index)
       if(this.listData[index].liu_yang_ri_qi_=== undefined || this.listData[index].liu_yang_ri_qi_ === null){
-        this.listData[index].xiao_hui_ri_qi_ = null
-        this.listData[index].liu_yang_qi_xian = null
+        this.listData[index].xiao_hui_ri_qi_ = ""
+        this.listData[index].liu_yang_qi_xian = ""
       }else{
         this.flag = false
-        let itemData =  dayjs(this.listData[index].liu_yang_ri_qi_).add(7,'day').format("YYYY-MM-DD")
+        // let itemData =  dayjs(this.listData[index].liu_yang_ri_qi_).add(7,'day').format("YYYY-MM-DD")
         let val =  dayjs(this.listData[index].liu_yang_ri_qi_).add(3,'month').format("YYYY-MM-DD")
-        this.listData[index].xiao_hui_ri_qi_ = itemData
+        // this.listData[index].xiao_hui_ri_qi_ = itemData
+        this.listData[index].xiao_hui_ri_qi_ = ""
         this.listData[index].liu_yang_qi_xian = val
         this.flag = true
       }

src/views/system/jbdScan/goods/manualConfirmationSupplementary.vue

@@ -844,9 +844,10 @@ import * as dayjs from 'dayjs'
         this.listData[index].liu_yang_qi_xian = null
       }else{
         this.flag = false
-        let itemData =  dayjs(this.listData[index].liu_yang_ri_qi_).add(7,'day').format("YYYY-MM-DD")
+        // let itemData =  dayjs(this.listData[index].liu_yang_ri_qi_).add(7,'day').format("YYYY-MM-DD")
         let val =  dayjs(this.listData[index].liu_yang_ri_qi_).add(3,'month').format("YYYY-MM-DD")
-        this.listData[index].xiao_hui_ri_qi_ = itemData
+        // this.listData[index].xiao_hui_ri_qi_ = itemData
+        this.listData[index].xiao_hui_ri_qi_ = null
         this.listData[index].liu_yang_qi_xian = val
         this.flag = true
       }

src/views/system/jbdScan/goods/sampleConfirmation.vue

@@ -800,13 +800,14 @@ import * as dayjs from 'dayjs'
     liuyanChange(item,index){
       // console.log(item,index)
       if(this.listData[index].liu_yang_ri_qi_=== undefined || this.listData[index].liu_yang_ri_qi_ === null){
-        this.listData[index].xiao_hui_ri_qi_ = null
-        this.listData[index].liu_yang_qi_xian = null
+        this.listData[index].xiao_hui_ri_qi_ = ""
+        this.listData[index].liu_yang_qi_xian = ""
       }else{
         this.flag = false
-        let itemData =  dayjs(this.listData[index].liu_yang_ri_qi_).add(7,'day').format("YYYY-MM-DD")
+        // let itemData =  dayjs(this.listData[index].liu_yang_ri_qi_).add(7,'day').format("YYYY-MM-DD")
         let val =  dayjs(this.listData[index].liu_yang_ri_qi_).add(3,'month').format("YYYY-MM-DD")
-        this.listData[index].xiao_hui_ri_qi_ = itemData
+        // this.listData[index].xiao_hui_ri_qi_ = itemData
+        this.listData[index].xiao_hui_ri_qi_ = ""
         this.listData[index].liu_yang_qi_xian = val
         this.flag = true
       }

src/views/system/jbdScan/js/manualConfirmationJS.js

@@ -398,13 +398,20 @@ export default {
 
                     let currentTime = new Date(new Date().getTime() + 28800000).toJSON().slice(0, 16).replace('T', ' ')
                     let allSQL = `select a.id_ as wtID,a.chu_ju_bao_gao_ya,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)
+                    // console.log(allSQL)
                     // 搜集所有选择的位置信息
                     //  console.log('当前选择的位置ids：',locationIds)
                     var allLocal = `select * from t_ypcfwz where find_in_set(id_,'${localStr}')`
                     Promise.all([repostCurd("sql", allSQL), repostCurd("sql", allLocal)]).then((res) => {
-                        let result = res[0].variables.data
+                        let initResult =  res[0].variables.data
+                        let result = []
                         let localInfo = res[1].variables.data
+                        // 排序
+                        ypInfoList.forEach(item=>{
+                            result.push(initResult.find(i => i.yang_pin_bian_hao === item.yang_pin_bian_hao))
+                        })
+
+
                         // console.log(localInfo)
                         /* 1、更新货架位置信息 */
                         this.emptyLocal = []
@@ -478,6 +485,8 @@ export default {
                                 /* 2、封装样品登记表对象,插入样品登记表 顺便封装任务分配表  */
                                 let ypdjb = []
                                 let rws = []
+                                console.log(result)
+                                console.log(ypInfoList)
                                 result.forEach((item, index) => {
                                     // 2-1:统计每个样品有多少类型[数量]
                                     let lxList = []

src/views/system/jbdScan/js/sampleConfirmationJS.js

@@ -347,12 +347,20 @@ export default {
 
                     let currentTime = new Date(new Date().getTime() + 28800000).toJSON().slice(0, 16).replace('T', ' ')
                     let allSQL = `select a.id_ as wtID,a.chu_ju_bao_gao_ya,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)
                     // 搜集所有选择的位置信息
                     //  console.log('当前选择的位置ids：',locationIds)
                     var allLocal = `select * from t_ypcfwz where find_in_set(id_,'${localStr}')`
                     Promise.all([repostCurd("sql", allSQL), repostCurd("sql", allLocal)]).then((res) => {
-                        let result = res[0].variables.data
+                        let initResult =  res[0].variables.data
+                        let result = []
                         let localInfo = res[1].variables.data
+                        // 排序
+                        ypInfoList.forEach(item=>{
+                            result.push(initResult.find(i => i.yang_pin_bian_hao === item.yang_pin_bian_hao))
+                        })
+
+
                         // console.log(localInfo)
                         /* 1、更新货架位置信息 */
                         this.emptyLocal = []
@@ -426,6 +434,8 @@ export default {
                                 /* 2、封装样品登记表对象,插入样品登记表 顺便封装任务分配表  */
                                 let ypdjb = []
                                 let rws = []
+                                console.log(result)
+                                console.log(ypInfoList)
                                 result.forEach((item, index) => {
                                     // 2-1:统计每个样品有多少类型[数量]
                                     let lxList = []
@@ -483,39 +493,39 @@ export default {
                                                    c == 2 ? ypInfoList[index].shi_fou_liu_yang_san: 
                                                    c == 3 ? ypInfoList[index].shi_fou_liu_yang_si : ''
                                         let obj = {
-                                            wei_tuo_dan_hao_: item.wei_tuo_bian_hao_,
-                                            wei_tuo_dan_wei_: item.wtdh,
-                                            lian_xi_ren_: item.wei_tuo_fang_lian,
-                                            lian_xi_dian_hua_: item.wei_tuo_lian,
-                                            yang_ben_ming_che: item.yang_pin_ming_che,
-                                            yang_ben_bian_hao: item.yang_pin_bian_hao,
-                                            pi_hao_bian_hao_: item.song_jian_pi_hao_,
-                                            song_jian_dan_wei: item.song_jian_dan_wei,
-                                            xing_ming_: ypInfoList[index].xing_ming_=== undefined?'':ypInfoList[index].xing_ming_,
-                                            xing_bie_: ypInfoList[index].xing_bie_=== undefined?'':ypInfoList[index].xing_bie_,
-                                            nian_ling_: ypInfoList[index].nian_ling_=== undefined?'':ypInfoList[index].nian_ling_,
-                                            yang_ben_zhuang_t: item.yang_pin_zhuang_t,
-                                            shou_yang_ri_qi_: currentTime,
-                                            bei_zhu_: ypInfoList[index].bei_zhu_ === undefined?'':ypInfoList[index].bei_zhu_,
-                                            yang_ben_lei_xing: yblx,
-                                            yun_shu_tiao_jian: ystj,
-                                            yang_pin_shu_lian: ypsl,
-                                            yang_ben_gui_ge_s: ybgg,
-                                            yan_shou_jie_guo_: ypInfoList[index].yan_shou_jie_guo_,
-                                            cun_fang_wei_zhi_: sywz,
-                                            liu_zhuan_zhuang_: '待任务分配',
-                                            shi_fou_liu_yang_: ifLy,
-                                            liu_yang_ri_qi_: ifLy == '是'? ypInfoList[index].liu_yang_ri_qi_:'',
-                                            liu_yang_cun_fang: ifLy == '是'?lycf:'',
-                                            liu_yang_shu_lian: lysl == null ?'':lysl,
-                                            liu_yang_qi_xian: ifLy == '是'? ypInfoList[index].liu_yang_qi_xian:'',
-                                            xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_=== undefined?'':ypInfoList[index].xiao_hui_ri_qi_,
-                                            fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_=== undefined?'':ypInfoList[index].fan_yang_ri_qi_,
-                                            fan_yang_jyr: ypInfoList[index].fan_yang_jyr=== undefined?'':ypInfoList[index].fan_yang_jyr,
-                                            biao_zhi_uuid_: currentUUID,
-                                            song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu=== undefined?'':ypInfoList[index].song_yang_yao_qiu,
-                                            jian_ce_xiang_mu_: xiangMuZh,
-                                            shou_yang_ren_:this.$store.getters.userInfo.user.name
+                                                wei_tuo_dan_hao_: item.wei_tuo_bian_hao_,
+                                                wei_tuo_dan_wei_: item.wtdh,
+                                                lian_xi_ren_: item.wei_tuo_fang_lian,
+                                                lian_xi_dian_hua_: item.wei_tuo_lian,
+                                                yang_ben_ming_che: item.yang_pin_ming_che,
+                                                yang_ben_bian_hao: item.yang_pin_bian_hao,
+                                                pi_hao_bian_hao_: item.song_jian_pi_hao_,
+                                                song_jian_dan_wei: item.song_jian_dan_wei,
+                                                xing_ming_: ypInfoList[index].xing_ming_=== undefined?'':ypInfoList[index].xing_ming_,
+                                                xing_bie_: ypInfoList[index].xing_bie_=== undefined?'':ypInfoList[index].xing_bie_,
+                                                nian_ling_: ypInfoList[index].nian_ling_=== undefined?'':ypInfoList[index].nian_ling_,
+                                                yang_ben_zhuang_t: item.yang_pin_zhuang_t,
+                                                shou_yang_ri_qi_: currentTime,
+                                                bei_zhu_: ypInfoList[index].bei_zhu_ === undefined?'':ypInfoList[index].bei_zhu_,
+                                                yang_ben_lei_xing: yblx,
+                                                yun_shu_tiao_jian: ystj,
+                                                yang_pin_shu_lian: ypsl,
+                                                yang_ben_gui_ge_s: ybgg,
+                                                yan_shou_jie_guo_: ypInfoList[index].yan_shou_jie_guo_,
+                                                cun_fang_wei_zhi_: sywz,
+                                                liu_zhuan_zhuang_: '待任务分配',
+                                                shi_fou_liu_yang_: ifLy,
+                                                liu_yang_ri_qi_: ifLy == '是'? ypInfoList[index].liu_yang_ri_qi_:'',
+                                                liu_yang_cun_fang: ifLy == '是'?lycf:'',
+                                                liu_yang_shu_lian: lysl == null ?'':lysl,
+                                                liu_yang_qi_xian: ifLy == '是'? ypInfoList[index].liu_yang_qi_xian:'',
+                                                xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_=== undefined?'':ypInfoList[index].xiao_hui_ri_qi_,
+                                                fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_=== undefined?'':ypInfoList[index].fan_yang_ri_qi_,
+                                                fan_yang_jyr: ypInfoList[index].fan_yang_jyr=== undefined?'':ypInfoList[index].fan_yang_jyr,
+                                                biao_zhi_uuid_: currentUUID,
+                                                song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu=== undefined?'':ypInfoList[index].song_yang_yao_qiu,
+                                                jian_ce_xiang_mu_: xiangMuZh,
+                                                shou_yang_ren_:this.$store.getters.userInfo.user.name
                                     }
                                         // console.log(obj)
                                         ypdjb.push(obj)
@@ -565,7 +575,6 @@ export default {
                                         repostCurd('updates', '{"tableName":"t_lhwtzsb","paramWhere":[' + lhwtzsbID + '],"paramCond":{"zhuang_tai_":"任务分配进行中"}}')
                                     }
                                     console.log('样品登记表:',ypdjb)
-                                    
                                     if(ypdjb.length > 0){
                                         repostCurd('add', '{"tableName":"t_lhypdjb","paramWhere":' + JSON.stringify(ypdjb) + '}').then(()=>{
                                             console.log("样品登记表数据添加成功!")