盘点代码提交

李泰瑜
1 parent 72876144
Showing 13 changed files with 833 additions and 56 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/components/jeecg/index.js
ant-design-vue-jeecg/src/components/jeecgbiz/JButtonBizComponent/JSelectBizComponentModal.vue
ant-design-vue-jeecg/src/components/jeecgbiz/JButtonBizComponent/JSelectBizQueryItem.js
ant-design-vue-jeecg/src/components/jeecgbiz/JButtonBizComponent/README.md
ant-design-vue-jeecg/src/components/jeecgbiz/JButtonBizComponent/index.vue
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiCycleCount.vue
ant-design-vue-jeecg/src/views/system/stocktaking/CycleCountDetailList.vue
ant-design-vue-jeecg/src/views/system/stocktaking/modules/CycleCountHeaderForm.vue
ant-design-vue-jeecg/src/views/system/stocktaking/subTables/CycleCountDetailChildSubTable.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/ICycleCountDetailService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java
@@ -155,6 +155,8 @@ export const createCheckOutTask = (params) =&gt; postAction(&#39;/task/taskHeader/creat
 export const selectPort = (params) => postAction('/task/taskHeader/selectPort', params);
 //创建跨站任务
 export const createOverStationTask = (params) => postAction('/task/taskHeader/createOverStationTask', params);
+//盘点任务生成
+export const stockTakeTask = (params) => postAction('/cycleCountDetail/cycleCountDetail/stockTakeTask?ids='+params, params);
 //创建空托盘组入库任务
 export const createManyEmptyIn = (params) => postAction('/task/taskHeader/createManyEmptyIn', params);
 //创建空托盘组出库任务
@@ -30,6 +30,7 @@ import JEasyCron from &#39;@/components/jeecg/JEasyCron&#39;
 //jeecgbiz
 import JSelectDepart from '../jeecgbiz/JSelectDepart.vue'
 import JSelectMultiUser from '../jeecgbiz/JSelectMultiUser.vue'
+import JSelectMultiCycleCount from '../jeecgbiz/JSelectMultiCycleCount.vue'
 import JSelectPosition from '../jeecgbiz/JSelectPosition.vue'
 import JSelectRole from '../jeecgbiz/JSelectRole.vue'
 import JSelectUserByDep from '../jeecgbiz/JSelectUserByDep.vue'
@@ -74,6 +75,7 @@ export default {
     //jeecgbiz
     Vue.component('JSelectDepart', JSelectDepart)
     Vue.component('JSelectMultiUser', JSelectMultiUser)
+    Vue.component('JSelectMultiCycleCount', JSelectMultiCycleCount)
     Vue.component('JSelectPosition', JSelectPosition)
     Vue.component('JSelectRole', JSelectRole)
     Vue.component('JSelectUserByDep', JSelectUserByDep)
+<template>
+  <j-modal
+    centered
+    :title="name + '选择'"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="close"
+    cancelText="关闭">
+
+    <a-row :gutter="18">
+      <a-col :span="16">
+        <!-- 查询区域 -->
+        <a-form layout="inline" class="j-inline-form">
+          <!-- 固定条件 -->
+          <a-form-item :label="(queryParamText||name)">
+            <a-input v-model="queryParam[queryParamCode||valueKey]" :placeholder="'请输入' + (queryParamText||name)"
+                     @pressEnter="searchQuery"/>
+          </a-form-item>
+          <!-- 动态生成的查询条件 -->
+          <j-select-biz-query-item v-if="queryConfig.length>0" v-show="showMoreQueryItems" :queryParam="queryParam"
+                                   :queryConfig="queryConfig" @pressEnter="searchQuery"/>
+          <!-- 按钮 -->
+          <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+          <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+          <a v-if="queryConfig.length>0" @click="showMoreQueryItems=!showMoreQueryItems" style="margin-left: 8px">
+            {{ showMoreQueryItems ? '收起' : '展开' }}
+            <a-icon :type="showMoreQueryItems ? 'up' : 'down'"/>
+          </a>
+        </a-form>
+
+        <a-table
+          size="middle"
+          bordered
+          :rowKey="rowKey"
+          :columns="innerColumns"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          :scroll="{ y: 240 }"
+          :rowSelection="{selectedRowKeys, onChange: onSelectChange, type: multiple ? 'checkbox':'radio'}"
+          :customRow="customRowFn"
+          @change="handleTableChange">
+        </a-table>
+
+      </a-col>
+      <a-col :span="8">
+        <a-card :title="'已选' + name" :bordered="false" :head-style="{padding:0}" :body-style="{padding:0}">
+
+          <a-table size="middle" :rowKey="rowKey" bordered v-bind="selectedTable">
+              <span slot="action" slot-scope="text, record, index">
+                <a @click="handleDeleteSelected(record, index)">删除</a>
+              </span>
+          </a-table>
+
+        </a-card>
+      </a-col>
+    </a-row>
+  </j-modal>
+</template>
+
+<script>
+import {getAction} from '@/api/manage'
+import Ellipsis from '@/components/Ellipsis'
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import {pushIfNotExist} from '@/utils/util'
+import JSelectBizQueryItem from './JSelectBizQueryItem'
+import {cloneDeep} from 'lodash'
+import {stockTakeTask} from "../../../api/api";
+
+export default {
+  name: 'JSelectBizComponentModal',
+  mixins: [JeecgListMixin],
+  components: {Ellipsis, JSelectBizQueryItem},
+  props: {
+    value: {
+      type: Array,
+      default: () => []
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    valueKey: {
+      type: String,
+      required: true
+    },
+    multiple: {
+      type: Boolean,
+      default: true
+    },
+    width: {
+      type: Number,
+      default: 900
+    },
+
+    name: {
+      type: String,
+      default: ''
+    },
+    listUrl: {
+      type: String,
+      required: true,
+      default: ''
+    },
+    // 根据 value 获取显示文本的地址，例如存的是 username，可以通过该地址获取到 realname
+    valueUrl: {
+      type: String,
+      default: ''
+    },
+    displayKey: {
+      type: String,
+      default: null
+    },
+    columns: {
+      type: Array,
+      required: true,
+      default: () => []
+    },
+    // 查询条件Code
+    queryParamCode: {
+      type: String,
+      default: null
+    },
+    // 查询条件文字
+    queryParamText: {
+      type: String,
+      default: null
+    },
+    // 查询配置
+    queryConfig: {
+      type: Array,
+      default: () => []
+    },
+    rowKey: {
+      type: String,
+      default: 'id'
+    },
+    // 过长裁剪长度，设置为 -1 代表不裁剪
+    ellipsisLength: {
+      type: Number,
+      default: 12
+    },
+  },
+  data() {
+    return {
+      innerValue: [],
+      // 已选择列表
+      selectedTable: {
+        pagination: false,
+        scroll: {y: 240},
+        columns: [
+          {
+            ...this.columns[0],
+            width: this.columns[0].widthRight || this.columns[0].width,
+          },
+          {title: '操作', dataIndex: 'action', align: 'center', width: 60, scopedSlots: {customRender: 'action'},}
+        ],
+        dataSource: [],
+      },
+      renderEllipsis: (value) => (<ellipsis length={this.ellipsisLength}>{value}</ellipsis>),
+      url: {list: this.listUrl},
+      /* 分页参数 */
+      ipagination: {
+        current: 1,
+        pageSize: 5,
+        pageSizeOptions: ['5', '10', '20', '30'],
+        showTotal: (total, range) => {
+          return range[0] + '-' + range[1] + ' 共' + total + '条'
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
+      },
+      options: [],
+      dataSourceMap: {},
+      showMoreQueryItems: false,
+    }
+  },
+  computed: {
+    // 表头
+    innerColumns() {
+      let columns = cloneDeep(this.columns)
+      columns.forEach(column => {
+        // 给所有的列加上过长裁剪
+        if (this.ellipsisLength !== -1) {
+          // JSelectBizComponent columns 建议开放customRender等方法类配置
+          // https://github.com/jeecgboot/jeecg-boot/issues/3203
+          let myCustomRender = column.customRender
+          column.customRender = (text, record, index) => {
+            let value = text
+            if (typeof myCustomRender === 'function') {
+              // noinspection JSVoidFunctionReturnValueUsed
+              value = myCustomRender(text, record, index)
+            }
+            if (typeof value === 'string') {
+              return this.renderEllipsis(value)
+            }
+            return value
+          }
+        }
+      })
+      return columns
+    },
+  },
+  watch: {
+    value: {
+      deep: true,
+      immediate: true,
+      handler(val) {
+        this.innerValue = cloneDeep(val)
+        this.selectedRowKeys = []
+        this.valueWatchHandler(val)
+        this.queryOptionsByValue(val)
+      }
+    },
+    dataSource: {
+      deep: true,
+      handler(val) {
+        this.emitOptions(val)
+        this.valueWatchHandler(this.innerValue)
+      }
+    },
+    selectedRowKeys: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        //update--begin--autor:scott-----date:20200927------for：选取职务名称出现全选 #1753-----
+        if (this.innerValue) {
+          this.innerValue.length = 0;
+        }
+        //update--end--autor:scott-----date:20200927------for：选取职务名称出现全选 #1753-----
+        this.selectedTable.dataSource = val.map(key => {
+          for (let data of this.dataSource) {
+            if (data[this.rowKey] === key) {
+              pushIfNotExist(this.innerValue, data[this.valueKey])
+              return data
+            }
+          }
+          for (let data of this.selectedTable.dataSource) {
+            if (data[this.rowKey] === key) {
+              pushIfNotExist(this.innerValue, data[this.valueKey])
+              return data
+            }
+          }
+          console.warn('未找到选择的行信息，key：' + key)
+          return {}
+        })
+      },
+    }
+  },
+
+  methods: {
+
+    /** 关闭弹窗 */
+    close() {
+      this.$emit('update:visible', false)
+    },
+
+    valueWatchHandler(val) {
+      val.forEach(item => {
+        this.dataSource.concat(this.selectedTable.dataSource).forEach(data => {
+          if (data[this.valueKey] === item) {
+            pushIfNotExist(this.selectedRowKeys, data[this.rowKey])
+          }
+        })
+      })
+    },
+
+    queryOptionsByValue(value) {
+      if (!value || value.length === 0) {
+        return
+      }
+      // 判断options是否存在value，如果已存在数据就不再请求后台了
+      let notExist = false
+      for (let val of value) {
+        let find = false
+        for (let option of this.options) {
+          if (val === option.value) {
+            find = true
+            break
+          }
+        }
+        if (!find) {
+          notExist = true
+          break
+        }
+      }
+      if (!notExist) return
+      getAction(this.valueUrl || this.listUrl, {
+        // 这里最后加一个 , 的原因是因为无论如何都要使用 in 查询，防止后台进行了模糊匹配，导致查询结果不准确
+        [this.valueKey]: value.join(',') + ',',
+        pageNo: 1,
+        pageSize: value.length
+      }).then((res) => {
+        if (res.success) {
+          let dataSource = res.result
+          if (!(dataSource instanceof Array)) {
+            dataSource = res.result.records
+          }
+          this.emitOptions(dataSource, (data) => {
+            pushIfNotExist(this.innerValue, data[this.valueKey])
+            pushIfNotExist(this.selectedRowKeys, data[this.rowKey])
+            pushIfNotExist(this.selectedTable.dataSource, data, this.rowKey)
+          })
+        }
+      })
+    },
+
+    emitOptions(dataSource, callback) {
+      dataSource.forEach(data => {
+        let key = data[this.valueKey]
+        this.dataSourceMap[key] = data
+        pushIfNotExist(this.options, {label: data[this.displayKey || this.valueKey], value: key}, 'value')
+        typeof callback === 'function' ? callback(data) : ''
+      })
+      this.$emit('options', this.options, this.dataSourceMap)
+    },
+
+    /** 完成选择 */
+    handleOk() {
+      let value = this.selectedTable.dataSource.map(data => data[this.valueKey])
+      // this.$emit('input', value)
+
+      if (value.length>=1)
+      {
+        stockTakeTask(value).then((res) => {
+          if (res.success) {
+            that.$message.success(res.message);
+            that.$emit('ok');
+            that.model.containerCode = '';
+            that.model.toPortCode = '';
+          } else {
+            that.$message.warning(res.message);
+          }
+        }).finally(() => {
+          that.confirmLoading = false;
+          that.close();
+        })
+      }else
+      {
+        alert("至少选择一项")
+      }
+
+      //
+      // this.close()
+    },
+    /** 删除已选择的 */
+    handleDeleteSelected(record, index) {
+      this.selectedRowKeys.splice(this.selectedRowKeys.indexOf(record[this.rowKey]), 1)
+      //update--begin--autor:wangshuai-----date:20200722------for：JSelectBizComponent组件切换页数值问题------
+      this.selectedTable.dataSource.splice(this.selectedTable.dataSource.indexOf(record), 1)
+      this.innerValue.splice(this.innerValue.indexOf(record[this.valueKey]), 1)
+      console.log("this.selectedRowKeys:", this.selectedRowKeys)
+      console.log("this.selectedTable.dataSource:", this.selectedTable.dataSource)
+      //update--begin--autor:wangshuai-----date:20200722------for：JSelectBizComponent组件切换页数值问题------
+    },
+
+    customRowFn(record) {
+      return {
+        on: {
+          click: () => {
+            let key = record[this.rowKey]
+            if (!this.multiple) {
+              this.selectedRowKeys = [key]
+              this.selectedTable.dataSource = [record]
+            } else {
+              let index = this.selectedRowKeys.indexOf(key)
+              if (index === -1) {
+                this.selectedRowKeys.push(key)
+                this.selectedTable.dataSource.push(record)
+              } else {
+                this.handleDeleteSelected(record, index)
+              }
+            }
+          }
+        }
+      }
+    },
+
+  }
+}
+</script>
+<style lang="less" scoped>
+.full-form-item {
+  display: flex;
+  margin-right: 0;
+
+  /deep/ .ant-form-item-control-wrapper {
+    flex: 1 1;
+    display: inline-block;
+  }
+}
+
+.j-inline-form {
+  /deep/ .ant-form-item {
+    margin-bottom: 12px;
+  }
+
+  /deep/ .ant-form-item-label {
+    line-height: 32px;
+    width: auto;
+  }
+
+  /deep/ .ant-form-item-control {
+    height: 32px;
+    line-height: 32px;
+  }
+}
+</style>
 \ No newline at end of file
+export default {
+  name: 'JSelectBizQueryItem',
+  props: {
+    queryParam: Object,
+    queryConfig: Array,
+  },
+  data() {
+    return {}
+  },
+  methods: {
+    renderQueryItem() {
+      return this.queryConfig.map(queryItem => {
+        const {key, label, placeholder, dictCode, props, customRender} = queryItem
+        const options = {
+          props: {},
+          on: {
+            pressEnter: () => this.$emit('pressEnter'),
+          }
+        }
+        if (props != null) {
+          Object.assign(options.props, props)
+        }
+        if (placeholder === undefined) {
+          if (dictCode) {
+            options.props['placeholder'] = `请选择${label}`
+          } else {
+            options.props['placeholder'] = `请输入${label}`
+          }
+        } else {
+          options.props['placeholder'] = placeholder
+        }
+
+        let input
+        if (typeof customRender === 'function') {
+          input = customRender.call(this, {key, options, queryParam: this.queryParam})
+        } else if (dictCode) {
+          input =
+            <j-dict-select-tag {...options} vModel={this.queryParam[key]} dictCode={dictCode} style="width:180px;"/>
+        } else {
+          input = <a-input {...options} vModel={this.queryParam[key]}/>
+        }
+        return <a-form-item key={key} label={label}>{input}</a-form-item>
+      })
+    },
+  },
+  render() {
+    return <span>{this.renderQueryItem()}</span>
+  },
+}
 \ No newline at end of file
+# JSelectBizComponent
+
+Jeecg 选择组件的公共可复用组件
+
+## 引用方式
+
+```js
+import JSelectBizComponent from '@/src/components/jeecgbiz/JSelectBizComponent'
+
+export default {
+  components: { JSelectBizComponent }
+}
+```
+
+## 参数
+
+### 配置参数
+
+| 参数名                | 类型    | 必填 | 默认值       | 备注                                                                                 |
+|-----------------------|---------|------|--------------|--------------------------------------------------------------------------------------|
+| rowKey                | String  |      | "id"         | 唯一标识的字段名                                                                     |
+| value(v-model)        | String  |      | ""           | 默认选择的数据，多个用半角逗号分割                                                   |
+| name                  | String  |      | ""           | 显示名字，例如选择用户就填写"用户"                                                   |
+| listUrl               | String  | 是   |              | 数据请求地址，必须是封装了分页的地址                                                 |
+| valueUrl              | String  |      | ""           | 获取显示文本的地址，例如存的是 username，可以通过该地址获取到 realname               |
+| displayKey            | String  |      | null         | 显示在标签上的字段 key ，不传则直接显示数据                                       |
+| returnKeys            | Array   |      | ['id', 'id'] | v-model 绑定的 keys，是个数组，默认使用第二项，当配置了 `returnId=true` 就返回第一项 |
+| returnId              | Boolean |      | false        | 返回ID，设为true后将返回配置的 `returnKeys` 中的第一项                               |
+| selectButtonText      | String  |      | "选择"       | 选择按钮的文字                                                                       |
+| queryParamText        | String  |      | null         | 查询条件显示文字，不传则使用 `name`                                                  |
+| columns               | Array   | 是   |              | 列配置项，与antd的table的配置完全一致。列的第一项会被配置成右侧已选择的列表上        |
+| columns[0].widthRight | String   |      | null         | 仅列的第一项可以应用此配置，表示右侧已选择列表的宽度，建议 `70%`，不传则应用`width`  |
+| placeholder           | String  |      | "请选择"     | 占位符                                                                               |
+| disabled              | Boolean |      | false        | 是否禁用                                                                             |
+| multiple              | Boolean |      | false        | 是否可多选                                                                           |
+| buttons               | Boolean |      | true         | 是否显示"选择"按钮，如果不显示，可以直接点击文本框打开选择界面                       |
+<template>
+  <a class="j-select-biz-component-box" type="flex" :gutter="8">
+    <a-button type="primary" icon="plus" :disabled="disabled" @click="visible=true">{{ selectButtonText }}
+    </a-button>
+    <j-select-biz-component-modal
+      v-model="selectValue"
+      :visible.sync="visible"
+      v-bind="modalProps"
+      @options="handleOptions"
+    />
+  </a>
+</template>
+
+<script>
+import JSelectBizComponentModal from './JSelectBizComponentModal'
+
+export default {
+  name: 'JSelectBizComponent',
+  components: {JSelectBizComponentModal},
+  props: {
+    value: {
+      type: String,
+      default: ''
+    },
+    /** 是否返回 id，默认 false，返回 code */
+    returnId: {
+      type: Boolean,
+      default: false
+    },
+
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    // 是否支持多选，默认 true
+    multiple: {
+      type: Boolean,
+      default: true
+    },
+    // 是否显示按钮，默认 true
+    buttons: {
+      type: Boolean,
+      default: true
+    },
+    // 显示的 Key
+    displayKey: {
+      type: String,
+      default: null
+    },
+    // 返回的 key
+    returnKeys: {
+      type: Array,
+      default: () => ['id', 'id']
+    },
+    // 选择按钮文字
+    selectButtonText: {
+      type: String,
+      default: '新增'
+    },
+
+  },
+  data() {
+    return {
+      selectValue: [],
+      selectOptions: [],
+      dataSourceMap: {},
+      visible: false,
+      selectOpen: false,
+    }
+  },
+  computed: {
+    valueKey() {
+      return this.returnId ? this.returnKeys[0] : this.returnKeys[1]
+    },
+    modalProps() {
+      return Object.assign({
+        valueKey: this.valueKey,
+        multiple: this.multiple,
+        returnKeys: this.returnKeys,
+        displayKey: this.displayKey || this.valueKey
+      }, this.$attrs)
+    },
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler(val) {
+        if (val) {
+          this.selectValue = val.split(',')
+        } else {
+          this.selectValue = []
+        }
+      }
+    },
+    selectValue: {
+      deep: true,
+      handler(val) {
+        let rows = val.map(key => this.dataSourceMap[key])
+        let data = val.join(',')
+        if (data !== this.value) {
+          this.$emit('select', rows)
+          this.$emit('input', data)
+          this.$emit('change', data)
+        }
+      }
+    }
+  },
+  methods: {
+    handleOptions(options, dataSourceMap) {
+      this.selectOptions = options
+      this.dataSourceMap = dataSourceMap
+    },
+    handleDropdownVisibleChange() {
+      // 解决antdv自己的bug —— open 设置为 false 了，点击后还是添加了 open 样式，导致点击事件失效
+      this.selectOpen = true
+      this.$nextTick(() => {
+        this.selectOpen = false
+      })
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.j-select-biz-component-box {
+
+  @width: 82px;
+
+  .left {
+    width: calc(100% - @width - 8px);
+  }
+
+  .right {
+    width: @width;
+  }
+
+  .full {
+    width: 100%;
+  }
+
+  /deep/ .ant-select-search__field {
+    display: none !important;
+  }
+}
+</style>
 \ No newline at end of file
+<template>
+  <!-- 定义在这里的参数都是不可在外部覆盖的，防止出现问题 -->
+  <j-select-biz-component
+    :value="value"
+    :ellipsisLength="25"
+    :listUrl="url.list"
+    :columns="columns"
+    v-on="$listeners"
+    v-bind="attrs"
+  />
+</template>
+
+<script>
+import JDate from '@comp/jeecg/JDate'
+import JSelectBizComponent from './JButtonBizComponent'
+
+export default {
+  name: 'JSelectMultiCycleCount',
+  components: {JDate, JSelectBizComponent},
+  props: {
+    value: null, // any type
+    queryConfig: {
+      type: Array,
+      default: () => []
+    },
+  },
+  data() {
+    return {
+      url: {list: '/inventory/inventoryHeader/list'},
+      columns: [
+        {title: '容器号', align: 'center', width: '25%',widthRight: '70%', dataIndex: 'containerCode'},
+        {title: '容器状态', align: 'center', width: '20%', dataIndex: 'containerStatus'},
+        {title: '库位号', align: 'center', width: '20%', dataIndex: 'locationCode'},
+        {title: '总数量', align: 'center', width: '20%', dataIndex: 'totalQty'},
+        {title: '库区', align: 'center', width: '20%', widthRight: '70%', dataIndex: 'zoneCode'},
+        {title: '状态', align: 'center', width: '20%', dataIndex: 'enable'},
+        {title: 'ID', align: 'center', width: '20%', dataIndex: 'id'},
+      ],
+      // 定义在这里的参数都是可以在外部传递覆盖的，可以更灵活的定制化使用的组件
+      default: {
+        name: '库存',
+        width: 1200,
+        displayKey: 'id',
+        returnKeys: ['id','id'],
+        queryParamText: 'ID',
+      },
+      // 多条件查询配置queryConfigDefault
+      queryConfigDefault: [
+        // {
+        //   key: 'containerCode',
+        //   label: '容器号',
+        //   // 如果包含 dictCode，那么就会显示成下拉框
+        //   dictCode: 'sex',
+        // },
+      ],
+    }
+  },
+  computed: {
+    attrs() {
+      return Object.assign(this.default, this.$attrs, {
+        queryConfig: this.queryConfigDefault.concat(this.queryConfig)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped></style>
 \ No newline at end of file
@@ -12,7 +12,7 @@
  
     <!-- 操作按钮区域 begin -->
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
+      <j-select-multi-cycle-count  :query-config="selectUserQueryConfig"/>
       <a-button type="primary" icon="download" @click="handleExportXls('盘点明细表')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
@@ -141,51 +141,55 @@
     },
     data() {
       return {
+        // 选择用户查询条件配置
+        selectUserQueryConfig: [
+          {key: 'locationCode', label: '库位'},
+        ],
         description: '盘点明细表列表管理页面',
         // 表头
         columns: [
           {
-            title: '#',
+            title: 'ID',
             key: 'rowIndex',
             width: 60,
             align: 'center',
             customRender: (t, r, index) => parseInt(index) + 1
           },
+          // {
+          //   title: '盘点主单id',
+          //   align: 'center',
+          //   dataIndex: 'cycleCountHeadId',
+          // },
           {
-            title: '盘点主单id',
-            align: 'center',
-            dataIndex: 'cycleCountHeadId',
-          },
-          {
-            title: '盘点主单code',
+            title: '盘点主单编码',
             align: 'center',
             dataIndex: 'cycleCountHeadCode',
           },
-          {
-            title: '任务表头',
-            align: 'center',
-            dataIndex: 'taskHeaderId',
-          },
-          {
-            title: '任务明细头',
-            align: 'center',
-            dataIndex: 'taskDetailId',
-          },
-          {
-            title: '仓库',
-            align: 'center',
-            dataIndex: 'warehouseCode',
-          },
-          {
-            title: '货主',
-            align: 'center',
-            dataIndex: 'companyCode',
-          },
-          {
-            title: '库存明细头',
-            align: 'center',
-            dataIndex: 'inventoryDetailId',
-          },
+          // {
+          //   title: '任务表头',
+          //   align: 'center',
+          //   dataIndex: 'taskHeaderId',
+          // },
+          // {
+          //   title: '任务明细头',
+          //   align: 'center',
+          //   dataIndex: 'taskDetailId',
+          // },
+          // {
+          //   title: '仓库',
+          //   align: 'center',
+          //   dataIndex: 'warehouseCode',
+          // },
+          // {
+          //   title: '货主',
+          //   align: 'center',
+          //   dataIndex: 'companyCode',
+          // },
+          // {
+          //   title: '库存明细头',
+          //   align: 'center',
+          //   dataIndex: 'inventoryDetailId',
+          // },
           {
             title: '库位',
             align: 'center',
@@ -232,7 +236,7 @@
             dataIndex: 'completedAt',
           },
           {
-            title: '盘点明细状态',
+            title: '状态',
             align: 'center',
             dataIndex: 'enableStatus',
           },
@@ -43,7 +43,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
-              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
+              <a-input type="textarea"  v-model="model.remark" placeholder="请输入备注"  ></a-input>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -75,7 +75,7 @@
       return {
         // 选择用户查询条件配置
         selectUserQueryConfig: [
-          {key: 'phone', label: '电话'},
+          {key: 'locationCode', label: '库位'},
         ],
         companyList: [],
         CountTypeList:[],
@@ -58,20 +58,15 @@
         dataSource: [],
         columns: [
           {
-            title: '盘点主单code',
+            title: '盘点主单编码',
             align: 'center',
             dataIndex: 'cyclecountheadcode',
           },
-          {
-            title: '盘点明细ID主id',
-            align: 'center',
-            dataIndex: 'cycleCountDetailid',
-          },
-          {
-            title: '盘点明细子单状态',
-            align: 'center',
-            dataIndex: 'childStatus',
-          },
+          // {
+          //   title: '盘点明细ID主id',
+          //   align: 'center',
+          //   dataIndex: 'cycleCountDetailid',
+          // },
           {
             title: '库位',
             align: 'center',
@@ -118,7 +113,12 @@
             dataIndex: 'gapQty',
           },
           {
-            title: '库存明细id',
+            title: '明细状态',
+            align: 'center',
+            dataIndex: 'childStatus',
+          },
+          {
+            title: '库存明细ID',
             align: 'center',
             dataIndex: 'inventoryDetaiId',
           },
@@ -9,11 +9,18 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
  
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
 import javax.servlet.http.HttpServletResponse;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.jeecg.modules.wms.framework.Convert;
+import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
+import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
+import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
+import org.jeecg.utils.StringUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -54,12 +61,13 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 @RestController
 @RequestMapping("/cycleCountDetail/cycleCountDetail")
 @Slf4j
-public class CycleCountDetailController {
+public class CycleCountDetailController  extends HuahengBaseController {
 	@Autowired
 	private ICycleCountDetailService cycleCountDetailService;
 	@Autowired
 	private ICycleCountDetailChildService cycleCountDetailChildService;
-
+	@Autowired
+	private IInventoryDetailService inventoryDetailService;
 	/**
 	 * 分页列表查询
 	 *
@@ -164,6 +172,32 @@ public class CycleCountDetailController {
  
 	}
  
+	 /**
+	  *   添加盘点
+	  *
+	  */
+	 @AutoLog(value = "盘点添加")
+	 @ApiOperation(value="盘点添加", notes="盘点添加")
+	 @PostMapping(value = "/stockTakeTask")
+	 public Result<String> stockTakeTask(@RequestParam(name = "ids", required = true) String ids) {
+		 if (StringUtils.isEmpty(ids)) {
+			 return Result.error("taskId不能为空");
+		 }
+		 Result result = null;
+		 Integer[] idList = Convert.toIntArray(ids);
+		 for (int taskId : idList) {
+			 result = handleMultiProcess("cancelTask", new HuahengBaseController.MultiProcessListener() {
+				 @Override
+				 public Result doProcess() {
+					 Result result = cycleCountDetailService.stockDetailAdd(taskId);
+					 return result;
+				 }
+			 });
+		 }
+		 return result;
+
+	 }
+
 	/**
 	 * 通过id查询
 	 *
 package org.jeecg.modules.wms.stocktaking.cycleCountDetail.service;
  
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.stocktaking.cycleCountDetail.entity.CycleCountDetailChild;
 import org.jeecg.modules.wms.stocktaking.cycleCountDetail.entity.CycleCountDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -17,24 +18,25 @@ public interface ICycleCountDetailService extends IService&lt;CycleCountDetail&gt; {
  
 	/**
 	 * 添加一对多
-	 * 
+	 *
 	 */
 	public void saveMain(CycleCountDetail cycleCountDetail,List<CycleCountDetailChild> cycleCountDetailChildList) ;
-	
+
 	/**
 	 * 修改一对多
-	 * 
+	 *
 	 */
 	public void updateMain(CycleCountDetail cycleCountDetail,List<CycleCountDetailChild> cycleCountDetailChildList);
-	
+
 	/**
 	 * 删除一对多
 	 */
 	public void delMain (String id);
-	
+
 	/**
 	 * 批量删除一对多
 	 */
 	public void delBatchMain (Collection<? extends Serializable> idList);
-	
+
+    Result stockDetailAdd(int taskId);
 }
@@ -2,6 +2,9 @@ package org.jeecg.modules.wms.stocktaking.cycleCountDetail.service.impl;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
+import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
 import org.jeecg.modules.wms.stocktaking.cycleCountDetail.entity.CycleCountDetail;
 import org.jeecg.modules.wms.stocktaking.cycleCountDetail.entity.CycleCountDetailChild;
 import org.jeecg.modules.wms.stocktaking.cycleCountDetail.mapper.CycleCountDetailChildMapper;
@@ -28,6 +31,8 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
 	private CycleCountDetailMapper cycleCountDetailMapper;
 	@Autowired
 	private CycleCountDetailChildMapper cycleCountDetailChildMapper;
+	@Autowired
+	private IInventoryDetailService inventoryDetailService;
  
 	@Override
 	@Transactional
@@ -82,4 +87,23 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
 		}
 	}
  
+	@Override
+	public Result stockDetailAdd(int taskId) {
+		LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+		inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getInventoryHeaderId,taskId);
+		List<InventoryDetail> inventoryDetails = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
+
+		CycleCountDetail cycleCountDetailChild = new CycleCountDetail();
+		cycleCountDetailChild.setCompanyCode(inventoryDetails.get(0).getCompanyCode());
+		cycleCountDetailChild.setContainerCode(inventoryDetails.get(0).getContainerCode());
+
+
+		for(InventoryDetail inventoryDetail:inventoryDetails)
+		{
+
+		}
+
+		return Result.ok("添加成功");
+	}
+
 }