Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/wms_app into phyzasrs

whycq

2024-05-18 c03369d5d964be137b621198e7a5a506c87fa33c

 pages/phyz/stationManage/stationDetl.vue

@@ -36,7 +36,7 @@
            <view>商品编码:{{wrkDetl.matnr}}</view>
            <view>销售订单号:{{wrkDetl.threeCode ? wrkDetl.threeCode : ' --'}}</view>
            <view>自由项:{{wrkDetl.deadTime ? wrkDetl.deadTime : ' --'}}</view>
            <view>出库数量:{{wrkDetl.anfme}}</view>
            <view>作业数量:{{wrkDetl.anfme}}</view>
         </view>
      </view>
      
@@ -81,7 +81,7 @@
         <uni-popup ref="doContainerMoveOut" type="dialog">
            <view class="popup">
               <!-- 标题 -->
               <view class="title">请输入空货架码</view>
               <view class="title">请输入货架码</view>
               <view class="popup-item">
                  <view class="popup-item-left">货架码:</view>
                  <view class="popup-item-right"><input type="text" v-model="barcode"></view>
@@ -124,7 +124,7 @@
               </view>
               <view class="btn">
                  <view class="btn-left" @click="pickInClose">取消</view>
                  <view class="btn-right" @click="pickIn()">入库</view>
                  <view class="btn-right" @click="pickIn()">确认拣料</view>
               </view>
            </view>
         </uni-popup>
@@ -153,6 +153,23 @@
         </uni-popup>
      </view>
      
      <!-- 弹窗 -->
      <view>
         <uni-popup ref="allocationIn" type="dialog">
            <view class="popup">
               <!-- 标题 -->
               <view class="title">请输入货架码</view>
               <view class="popup-item">
                  <view class="popup-item-left">货架码:</view>
                  <view class="popup-item-right"><input type="text" v-model="barcode"></view>
               </view>
               <view class="btn">
                  <view class="btn-left" @click="pickInClose">取消</view>
                  <view class="btn-right" @click="allocationInConfirm()">确认进场</view>
               </view>
            </view>
         </uni-popup>
      </view>
      
      
      
@@ -165,6 +182,8 @@
         <button size="mini" type="primary" @click="doPickIn()" v-if="btnType == 'pick'">已拣料回库</button>
         <button size="mini" type="primary" @click="doPickIn2()" v-if="btnType == 'pick'">再次拣料</button>
         <button size="mini" type="primary" @click="startPakin()" v-if="btnType == 'start'">启动入库</button>
         <button size="mini" type="primary" @click="allocationOut()" v-if="btnType == 'allocationOut'">调拨离场</button>
         <button size="mini" type="primary" @click="allocationIn()" v-if="btnType == 'allocationIn'">调拨进场</button>
      </view>
   </view>
</template>
@@ -218,21 +237,16 @@
                  res = res.data
                  if (res.code === 200) {
                     if (res.data.records[0].locSts == 'O') {
                        _this.btnType = 'emptyPakin' 
                        if (res.data.records[0].devNo.substring(0, 2) == "DB") {
                           _this.btnType = 'allocationIn' 
                        } else {
                           _this.btnType = 'emptyPakin' 
                        }
                     } else if (res.data.records[0].locSts == 'F') {
                        _this.btnType = 'pakin' 
                     } else {
                        _this.btnType = 'working' 
                     }
                     // if (res.data.records[0].locSts == 'O') {
                     //    res.data.records[0].locSts$ = '没有货架'
                     // } else if (res.data.records[0].locSts == 'F') {
                     //    res.data.records[0].locSts$ = '货架在库'
                     // } else if (res.data.records[0].locSts == 'S') {
                     //    res.data.records[0].locSts$ = '货架进入中'
                     // } else if (res.data.records[0].locSts == 'R') {
                     //    res.data.records[0].locSts$ = '货架离开中'
                     // }
                     
                     setTimeout(()=>{
                        for  (let k of res.data.records) {
@@ -415,6 +429,9 @@
                           _this.btnType = 'pick'
                        } else if (wrkMast.ioType == 110) {
                           wrkMast['ioTitle'] = '空板出库'
                        } else if (wrkMast.ioType == 111) {
                           wrkMast['ioTitle'] = '空板出库'
                           _this.btnType = 'allocationOut'
                        }
                        if (wrkMast.barcode == barcode) {
                           mast = wrkMast
@@ -629,6 +646,69 @@
               }
            });
         },
         // 调拨离场
         allocationOut() {
            let that = this
            let params = []
            let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
            params.push(param)
            uni.request({
               url: that.baseUrl + '/agvMobile/hand/control/allocationOut',
               header: {'token': uni.getStorageSync('token')},
               data: {devNo: that.station.devNo},
               method: 'POST',
               success(result) {
                  var res = result.data
                  if (res.code === 200) {
                     setTimeout(()=> {
                        that.barcode = ''
                        that.reloadStation()
                     },1000)
                     uni.showToast({ title: '离场成功', icon: "success", position: 'top' })
                  } else if (res.code == 403) {
                     uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                     setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
                  } else {
                     uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                  }
               }
            });
         },
         allocationIn() {
            this.$refs.allocationIn.open()
         },
         allocationInClose() {
            this.$refs.allocationIn.close()
         },
         allocationInConfirm() {
            let that = this
            let params = []
            let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
            params.push(param)
            uni.request({
               url: that.baseUrl + '/agvMobile/hand/control/allocationIn',
               header: {'token': uni.getStorageSync('token')},
               data: {devNo: that.station.devNo, barcode: that.barcode},
               method: 'POST',
               success(result) {
                  var res = result.data
                  if (res.code === 200) {
                     that.$refs.allocationIn.close()
                     setTimeout(()=> {
                        that.barcode = ''
                        that.reloadStation()
                     },1000)
                     uni.showToast({ title: '进场成功', icon: "success", position: 'top' })
                  } else if (res.code == 403) {
                     uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                     setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
                  } else {
                     uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                  }
               }
            });
         }
			
      }
   }
</script>
@@ -637,13 +717,13 @@
   @import url('../../../static/css/common/order.css');
   
   .station {
      font-size: 18px;
      padding: 24rpx;
      font-size: 15px;
      padding: 18rpx;
   }
   .station-title {
      font-size: 32px;
      font-size: 28px;
      font-weight: bold;
      padding: 24rpx 0;
      padding: 18rpx 0;
   }
   .station-barcode {
      font-size: 24px;