移位、制造叫料、制造移位、台车配料

src/api/bomAccount.js

@@ -60,6 +60,14 @@ export function edit(data) {
   })
 }
 
+export function tcOut(ids) {
+  return request({
+    url: 'api/bomAccount/tcOut',
+    method: 'post',
+    data: ids
+  })
+}
+
 export function queryBomPrintListD(data) {
   return request({
     url: 'api/bomAccount/queryBomPrintListD' + '?' + qs.stringify(data, { indices: false }),
@@ -68,6 +76,14 @@ export function queryBomPrintListD(data) {
   })
 }
 
+export function queryBomPrintListTC(data) {
+  return request({
+    url: 'api/bomAccount/queryBomPrintListTC' + '?' + qs.stringify(data, { indices: false }),
+    method: 'get',
+    data
+  })
+}
+
 export function queryBomPrintListX(data) {
   return request({
     url: 'api/bomAccount/queryBomPrintListX' + '?' + qs.stringify(data, { indices: false }),

src/views/base-data/area/index.vue

@@ -87,6 +87,7 @@
             <el-checkbox label="线边接收" style="font-weight :bold" v-model="form.bexb"></el-checkbox>
             <el-checkbox label="收货仓库" style="font-weight :bold" v-model="form.besh"></el-checkbox>
             <el-checkbox label="制造库位耗用" style="font-weight :bold" v-model="form.bezz"></el-checkbox>
+            <el-checkbox label="台车库区" style="font-weight :bold" v-model="form.betc"></el-checkbox>
           </div>
 
         </el-form>

src/views/base-data/bomAccount/index.vue

@@ -162,6 +162,9 @@
           <el-form-item label="大小物" prop="bp_type">
             <el-input v-model="form.bp_type" style="width: 180px;" />
           </el-form-item>
+          <el-form-item label="制材分区" prop="zcfq">
+            <el-input v-model="form.zcfq" style="width: 180px;" />
+          </el-form-item>
           <el-form-item label="描述" prop="description">
             <el-input v-model="form.description" :rows="3" type="textarea" style="width: 380px;" />
           </el-form-item>
@@ -261,7 +264,7 @@ export default {
   mixins: [presenter(), header(), form(defaultForm), crud()],
   dicts: ['process_content', 'out_type', 'station_type', 'bp_type','bonded_type','ac_type','zdw_type'],
   cruds() {
-    return CRUD({ title: 'BOM工位清单', url: 'api/bomAccount', idField: 'id', sort: 'id,desc', crudMethod: { ...crudBomAccount }})
+    return CRUD({ title: 'BOM工位清单', url: 'api/bomAccount', idField: 'id', sort: 'zPoint.code,asc', crudMethod: { ...crudBomAccount }})
   },
   computed: {
     ...mapGetters([

src/views/base-data/bomAccount/indexTcbq.vue

@@ -0,0 +1,167 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <el-input v-model="query.tckw" clearable placeholder="台车" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+      <el-input v-model="query.bigItemCode" clearable placeholder="机型" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+      <rrOperation :crud="crud" />
+      <crudOperation :permission="permission" :tableKey="this.$options.name">
+          <el-button
+                  slot="right"
+                  class="filter-item"
+                  type="primary"
+                  size="mini"
+                  @click="saveBomPrintTc()"
+                  icon="el-icon-document-add"
+          >
+            台车标签
+          </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="crud.selections.length == 0"
+          @click="tcOutBtn(crud.selections)"
+          v-permission="permission.tcOut"
+        >
+          台车配料
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table id="mytable" ref="table" border :height="crud.tableHeight" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler" >
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="hw" label="台车名" />
+        <el-table-column prop="jx" label="机型" />
+      </el-table>
+      <!--分页组件-->
+      <div style="position:absolute;right: 0">
+      <pagination />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {exportExcel} from '@/components/TableToExcel/ExportExcel'
+import {initData} from '@/api/data'
+import crudBomAccount, {queryBomPrintListTC} from '@/api/bomAccount'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import bigItem from '@/api/bigItem'
+import { getItemsList } from '@/api/item'
+import DateRangePicker from "@/components/DateRangePicker/index.vue";
+import { getAreas, queryAreaList } from '@/api/area'
+import { getToken } from '@/utils/auth'
+import DonMessage from '@/utils/message'
+import Link from "@/layout/components/Sidebar/Link.vue";
+import excelUtil from "@/api/tools/excelUtil"
+import { formatDate } from '@/utils/commonUtils'
+import {mapGetters} from "vuex";
+import AreaSelect from "@/views/generic-component/AreaSelect.vue";
+import PointSelect from "@/views/generic-component/PointSelect.vue";
+import PointCodeSelect from "@/views/generic-component/PointCodeSelect.vue";
+import {xbjsOut} from "@/api/pickOut";
+const defaultForm = { id: null, bigItem: null, supplier: null,item: null, contents: null, singles: null, rArea: null, cArea: null, outType: null, station_type: null, bp_type: null,  dept: null, enabled: null, createBy: null, updateBy: null, createTime: null, updateTime: null, description: null, ac: null, bonded: null, zPoint: { code: null }}
+export default {
+  name: 'BomAccountTcbq',
+  components: {
+    PointCodeSelect,
+    PointSelect, AreaSelect, Link, DateRangePicker, pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  dicts: ['process_content', 'out_type', 'station_type', 'bp_type','bonded_type','ac_type','zdw_type'],
+  cruds() {
+    return CRUD({ title: '台车标签', url: 'api/bomAccount/queryBomTckwPrintList', idField: 'id', sort: 'id,desc', crudMethod: { ...crudBomAccount },
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      },
+    })
+  },
+  computed: {
+    ...mapGetters([
+      'baseApi'
+    ])
+  },
+  data() {
+    return {
+      permission: {
+        tcOut: ['admin', 'tcbq:tcOut']
+      },
+      headers: { 'Authorization': getToken() },
+      loading_add:false,
+      fileList: [],
+      // 下拉框
+      bigItemList: [],
+      itemList: [],
+      rAreaList: [],
+      cAreaList: [],
+      excelQueryParam: {
+        excelConfigId: '912967151437389824',
+        queryParam: {
+          pageNo: 1,
+          bomAccount__完成品番: null,
+          bomAccount__完成品形式名: null,
+          bomAccount__工位: null,
+          bomAccount__部品品番: null,
+          currentPageNo: 1,
+          currentPageSize: 10,
+          pageSize: 10
+        }
+      },}
+  },
+  mounted() {
+    //计算界面高度
+
+  },
+  methods: {
+
+    handleErr(err, file, fileList) {
+
+      let myError = err.toString();//转字符串
+      myError = myError.replace("Error: ", "") // 去掉前面的" Error: "
+      myError = JSON.parse(myError);//转对象
+      DonMessage.error("" + myError['message'])
+    },
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    saveBomPrintTc() {
+      console.log("打印台车标签")
+      queryBomPrintListTC(this.crud.getQueryParams2()).then(res => {
+            this.showEwmReportTc();
+        })
+    },
+    showEwmReportTc(){
+          this.$router.push({path:'/base-data/base-ware/point_print_tc',query:{tableID: '打印台车标签'}})
+      },
+    tcOutBtn(data){
+      this.loading_add=true;
+      let tckws = [];
+      for (const obj of data) {
+        tckws.push(obj.hw)
+      }
+      tcOut(ids).then(res=>{
+        this.crud.toQuery()
+        this.loading_add=false;
+        this.$message.success("台车配料出库")
+      },e=>{
+        this.loading_add=false;
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/base-data/point/print_kw_tc.vue

@@ -0,0 +1,215 @@
+<template>
+  <div style="background: #ffffff">
+    <div class="button-container">
+      <el-button  @click="yulandayin" style="width: 200px;height: 50px"  type="primary">打印台车标签预览</el-button>
+    </div>
+    <div id="printMe" v-for="(kw3,groupIndex) in kwfenzu" :key="groupIndex"  class="group-container">
+      <div class="grid-container">
+      <div
+        v-for="k2 in kw3"
+        class="label-item" >
+        <table class="label-table">
+          <tr style="height: 6mm">
+            <td  class="td-item-value" style="width:25mm">台车名</td>
+            <td  class="td-item-value" colspan="1" style="width: 46mm;background:#fcd700">{{ k2.hw }}</td>
+            <td  class="td-item" rowspan="1" style="width: 23mm;height: 20mm;">
+              <vue-qrcode
+                  :value="getQrContent(k2)"
+                  :options="qrOptions"
+                  tag="img"
+                  class="qr-code"
+              />
+            </td>
+          </tr>
+          <tr style="height: 6mm">
+            <td  class="td-item-value"  rowspan="3" style="width:25mm">机型</td>
+            <td  class="td-item-value3" >{{ k2.jxs[0] }}</td>
+            <td  class="td-item-value3" >{{ k2.jxs[2] }}</td>
+          </tr>
+          <tr style="height: 6mm">
+            <td  class="td-item-value3" >{{ k2.jxs[3] }}</td>
+            <td  class="td-item-value3" >{{ k2.jxs[4] }}</td>
+          </tr>
+          <tr style="height: 6mm">
+            <td  class="td-item-value3" >{{ k2.jxs[5] }}</td>
+            <td  class="td-item-value3" >{{ k2.jxs[6] }}</td>
+          </tr>
+        </table>
+
+      </div>
+    </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { vPrint } from 'vue-print-next';
+import { VuePrintNext } from 'vue-print-next';
+import {bomPrintBiaoQianList} from "@/api/bomAccount";
+
+import VueQrcode from '@chenfengyuan/vue-qrcode';
+
+export default {
+  name: 'PointPrint',
+  components: {
+    VueQrcode
+  },
+  directives: {
+    print: vPrint
+  },
+  computed: {
+
+  },
+
+  data() {
+    return {
+      kkkk2: [],
+      kwfenzuAll: [],
+      kwfenzu: [],
+      qrOptions: {
+        width: 60,          // 二维码宽度
+        margin: 0,          // 边距
+        errorCorrectionLevel: 'H' // 容错级别（高）
+      },
+      qrSize: 120, // 二维码尺寸
+      // 示例数据 - 实际应用中可从API获取
+
+
+    }
+  },
+  mounted() {
+    this.getPrintList();
+  },
+  methods: {
+    getQrContent(location) {
+      // 自定义二维码内容，这里用箱种和品番组合
+      return `${location.ewm}`;
+
+      // 如果只需要箱种，可以直接用：
+      // return location.boxType;
+    },
+    //获取点位表的数据
+    yulandayin(){
+      new VuePrintNext({
+        el: '#printMe', /* 其他参数 */
+        popTitle: '打印台车标签',
+        preview: false,// 启用打印预览
+        paperSize: 'A4',
+        orientation: 'portrait'//landscape,portrait
+      });
+    },
+     getPrintList(){
+      console.log('打印台车标签')
+      bomPrintBiaoQianList('_TCBQ').then(res => {
+        console.log(res)
+        this.kkkk2=res;
+
+        this.kwfenzu=[]
+        for (let i = 0; i < this.kkkk2.length; i += 4) {
+          this.kwfenzu.push(this.kkkk2.slice(i, i + 4));
+        }
+        console.log(kwfenzu)
+      });
+    }
+
+  }
+}
+
+
+</script>
+<style lang="scss" scoped>
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+  font-family: 'Microsoft YaHei', sans-serif;
+}
+body {
+  background: linear-gradient(35deg, #f5f7fa 0%, #e4edf5 100%);
+  padding: 20px;
+  min-height: 100vh;
+}
+.button-container {
+  padding-top: 20px;
+  display: flex;
+  justify-content: center; /* 水平居中 */
+}
+.group-container{
+  padding-top: 1mm;
+  box-shadow: none;margin-bottom:0;padding: 0;border-radius: 0;
+  page-break-after: always;
+  break-after: page;
+}
+.label-item {
+  display: flex;
+  flex-wrap: wrap;
+
+  background: #ffffff;
+  justify-content: center;
+}
+.td-item{
+  text-align: center;
+  border: #000000 2px solid;
+  font-size: 6pt;
+  font-weight: bold;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.td-item-value{
+  font-size: 18pt;
+  font-weight: bold;
+  text-align: center;
+  border: #000000 2px solid;
+  white-space: nowrap;
+}
+
+.td-item-value2{
+  font-size: 15pt;
+  font-weight: bold;
+  text-align: center;
+  border: #000000 2px solid;
+}
+
+.td-item-value3{
+  font-size: 9pt;
+  font-weight: bold;
+  text-align: center;
+  border: #000000 2px solid;
+  overflow: hidden;
+  word-wrap: break-word;
+  overflow: hidden;
+}
+
+.qr-code {
+  padding: 1mm;
+  width: 22mm;   /* 控制显示大小 */
+  height: 22mm;
+  image-rendering: crisp-edges; /* 保持清晰度 */
+  display: block;
+  margin: 0 auto;
+}
+
+.label-table {
+  background: #00a0e9;
+
+  width: 170mm;
+  height: 60mm;
+  background: #ffffff;
+  border-collapse: collapse;
+  font-size: 13px;
+  table-layout: fixed;
+}
+
+.grid-container {
+  display: grid;
+  grid-template-columns: repeat(1, 1fr); /* 4列 */
+  grid-template-rows: repeat(4, 1fr);   /* 5行 */
+  width: 100%;
+  height: 100%;
+  background: #ffffff;
+  gap: 1mm 1mm; /* 标签之间的间隙 */
+}
+
+</style>

src/views/business-asn/asn/index.vue

@@ -129,7 +129,7 @@
           </el-form-item>-->
 
           <el-form-item label="库位" prop="point"  :rules=" { required: true, message: '库位不能为空', trigger: 'blur' }">
-            <PointSelect v-model="plsjForm.point" :value-key="'id'" :point_type="'CH'"  @change="getChangeVule"/>
+            <PointSelect v-model="plsjForm.point" :value-key="'id'" :point_type="'CH'" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -562,10 +562,10 @@ export default {
     },
 //批量上架
     mutilPutawayBtn(data) {
-      console.log(data)
       let data_ = this.plsjForm;
       data_.ids = data.map(v => v.id);
-      data_.pointId=this.plsjForm.pointId;
+      data_.pointId=this.plsjForm.point.id;
+      console.log(data_)
       console.log(this.plsjForm)
       mutilPutawaySys(data_).then(res=>{
         this.crud.toQuery()

src/views/business-inv/inventory/invXb.vue

@@ -42,7 +42,7 @@
           :value="item.value"
         />
       </el-select>
-   
+
 
       <el-select v-model="query.areaNames"  value-key="id" clearable placeholder="指示纳所"  style="width: 180px" filterable multiple reserve-keyword="true" >
         <el-option
@@ -242,7 +242,7 @@ export default {
     return CRUD({
       query: {
         quantity: 0,
-          bexb:true,
+          betc:true,
           pointType:'HCKW'
       },
       areaOptions: [],

src/views/business-inv/inventory/invXt.vue

@@ -72,7 +72,7 @@
         </el-button>
         <el-button
           slot="right"
-          v-permission="permission.xdMove"
+          v-permission="permission.countCheckBtn"
           class="filter-item"
           type="primary"
           size="mini"
@@ -215,7 +215,7 @@
             </el-button>
             <udOperation
               :data="scope.row"
-              :permission="permission"
+              :permission="permission.ywFTM"
               :show-dle="false"
             >
             </udOperation>
@@ -279,7 +279,8 @@ export default {
     return CRUD({
       query: {
         quantity: 0,
-        bexb:false
+        bexb:false,
+        betc:false
       },
       areaOptions: [],
       title: '库存信息',