Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu

肖洋

2025-01-10 b376af7c18021e8e2600c21a9328fedd335ef482

Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu

 Code Management/WMS/WIDESEA_WMSClient/src/api/buttons.js

@@ -131,6 +131,15 @@
    onClick: function () {
      
    }
    
  },{
    name: '补录数据',
    type: 'primary',
    // color: '#529b2e',
    value: 'SupplementationData',
    onClick: function () {
      
    }
  }
]


 Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock.jsx

@@ -8,12 +8,12 @@
//此js文件是用来自定义扩展业务代码，可以扩展一些自定义页面或者重新配置生成的代码

// import gridHeader from "./demo_Product/Dt_BillGroupStockDetail.vue";

import gridBody from "./extend/SupplementationData.vue"
let extension = {
  components: {
    //查询界面扩展组件
    gridHeader: '',
    gridBody: '',
    gridBody: gridBody,
    gridFooter: '',
    //新建、编辑弹出框扩展组件
    modelHeader: '',
@@ -55,6 +55,21 @@
            })
        }
      }

      var btnSupplementationData = this.buttons.find(x => x.value == "SupplementationData");
            if (btnSupplementationData != null) {
                btnSupplementationData.onClick = () => {
                    let rows = this.$refs.table.getSelected();
                        if (rows.length == 0) {
                            return this.$error("请选择数据!");
                        } else if (rows.length > 1) {
                            return this.$error("只能选择单条数据");
                        }
                        this.$refs.gridBody.open(rows[0].palletCode);
                        this.refresh();
                    }
                
                }
      //示例：在按钮的最前面添加一个按钮
      // this.buttons.unshift({
      //   //也可以用push或者splice方法来修改buttons数组

 Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/extend/SupplementationData.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,104 @@
<template>
  <vol-box v-model="show" title="补录数据" :width="800" :height="600">
    <template #content>
      <el-form ref="form" :model="form" label-width="90px">
        <el-form-item label="托盘号">
          <el-input type="text" v-model="this.form.palletCode" readonly></el-input>
        </el-form-item>
        <el-form-item label="出库OR入库" prop="OutIn">
          <el-select v-model="OutIn" placeholder="请选择出库Or入库">
            <el-option label="出库" value="Out" />
            <el-option label="入库" value="In" />
          </el-select>
        </el-form-item>
        <el-form-item label="区域" prop="areaID">
          <el-select v-model="form.areaID" placeholder="请选择区域">
            <el-option label="陈化" value="1" />
            <el-option label="静置" value="2" />
            <el-option label="分容" value="3" />
            <el-option label="高温" value="4" />
            <el-option label="常温1" value="5" />
            <el-option label="常温2" value="6" />
            <el-option label="常温3" value="7" />
          </el-select>
        </el-form-item>
      </el-form>
    </template>
    <template #footer>
      <div>
        <el-button type="danger" size="small" plain @click="submit">
          <i class="el-icon-check">确认</i>
        </el-button>
        <el-button size="small" type="primary" plain @click="() => {
            this.show = false;
          }
          ">
          <i class="el-icon-close">关闭</i>
        </el-button>
      </div>
    </template>
  </vol-box>
</template>

<script>
import VolBox from "@/components/basic/VolBox.vue";
export default {
  components: {
    "vol-box": VolBox,
  },
  data() {
    return {
      OutIn:"",
      form:{
        areaID:"",
        palletCode:""
      },
      show: false,
    };
  },
  methods: {
    open(palletCode) {
      this.show = true;
      this.form.palletCode=palletCode;
    },
    submit() {
      this.$emit("parentCall", ($vue) => {
        if (
          !this.OutIn ||
          !this.form.areaID ||
          !this.form.palletCode||
          this.OutIn==""||
          this.form.areaID==""||
          this.form.palletCode==""
        ) {
          this.$message.error("参数错误");
          return;
        }
        if(this.OutIn=="Out"){
          this.http.post("api/ProcessApply/StockOutDataBack", this.form, "").then((x) => {
          if (!x.status) {
            this.$message.error(x.message);
          } else {
            this.$Message.success("成功");
            this.show = false;
            $vue.refresh();
          }
        });
        }else if(this.OutIn=="In"){
          this.http.post("api/ProcessApply/StockInDataBack", this.form, "").then((x) => {
          if (!x.status) {
            this.$message.error(x.message);
          } else {
            this.$Message.success("成功");
            this.show = false;
            $vue.refresh();
          }
        });
        }
        
      });
    },
  },

};
</script>

 Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx

@@ -37,9 +37,11 @@
          this.http.get(`/api/Task/CompleteTaskAsync?taskNum=${taskNum}`, {}, "正在完成任务").then((res) => {
            //示例：调用后台接口
            if (res.status) {
              this.$Message.success('任务完成')
              this.$Message.success('任务完成');
              this.refresh();
            } else {
              this.$Message.error(res.message) //错误提示
              this.refresh();
            }
          })
        }

 Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue

@@ -60,8 +60,8 @@
        ]);
        const columns = ref([{ field: 'TaskId', title: '主键', type: 'string', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
        { field: 'taskNum', title: '任务号', type: 'int', width: 110, align: 'left', sort: true },
        { field: 'palletCode', title: '托盘号', type: 'string', width: 150, align: 'left' },
        { field: 'pnboundNo', title: '单据号', type: 'string', width: 110, align: 'left' },
        { field: 'palletCode', title: '托盘号', type: 'string', width: 180, align: 'left' },
        { field: 'pnboundNo', title: '单据号', type: 'string', width: 110, align: 'left',hidden:true },
        { field: 'groupID', title: '库存ID', type: 'int', width: 110, hidden: true, align: 'left' },
        { field: 'groupDetailId', title: '组盘明细ID', type: 'int', width: 110, hidden: true, align: 'left' },
        { field: 'roadway', title: '巷道', type: 'string', width: 110, align: 'left' },