Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

# Conflicts:
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/IMdMeMaterialbaseService.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/impl/MdMeMaterialbaseServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/impl/PdmBiProcessrouteServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessrouteServiceImpl.java
#	mes/qd/src/api/wms/basedata/master/customerbase.js

mes/qd/src/views/wms/pcs/saleorder/UploadDialog.vue

@@ -0,0 +1,116 @@
+<template>
+  <el-dialog
+    title="导入Excel文件"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="400px"
+    :show-close="true"
+    @close="close"
+    @open="open"
+  >
+    <el-upload
+      ref="upload"
+      class="upload-demo"
+      action=""
+      drag
+      :on-exceed="is_one"
+      :limit="1"
+      :auto-upload="false"
+      :multiple="false"
+      :show-file-list="true"
+      :on-change="uploadByJsqd"
+      :file-list="fileList"
+      accept=".xlsx,.xls"
+    >
+      <i class="el-icon-upload" />
+      <div class="el-upload__text">
+        将文件拖到此处，或
+        <em>点击上传</em>
+      </div>
+      <div slot="tip" class="el-upload__tip">只能上传Excel文件，且不超过10MB</div>
+    </el-upload>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import crudSaleOrder from '@/views/wms/pcs/saleorder/saleOrder'
+import CRUD, { crud } from '@crud/crud'
+
+export default {
+  name: 'UploadDialog',
+  mixins: [crud()],
+  components: {},
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      fileList: [],
+      file1: ''
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    openParam: {
+      handler(newValue, oldValue) {
+        this.opendtlParam = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    is_one() {
+      this.crud.notify('只能上传一个excel文件！', CRUD.NOTIFICATION_TYPE.WARNING)
+    },
+    // 文件校验方法
+    beforeAvatarUpload(file) {
+      // 不能导入大小超过2Mb的文件
+      if (file.size > 10 * 1024 * 1024) {
+        return false
+      }
+      return true
+    },
+    // 文件发生改变就会触发的事件
+    uploadByJsqd(file) {
+      this.file1 = file
+    },
+    submit() {
+      if (this.beforeAvatarUpload(this.file1)) {
+        this.fileList.name = this.file1.name
+        this.fileList.url = ''
+        var formdata = new FormData()
+        formdata.append('file', this.file1.raw)
+        // excelImport：请求接口 formdata：传递参数
+        crudSaleOrder.excelImport(formdata).then((res) => {
+          this.crud.notify('导入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.$emit('tableChanged3', '')
+          this.$emit('update:dialogShow', false)
+        })
+      } else {
+        this.crud.notify('文件过大，请上传小于10MB的文件〜', CRUD.NOTIFICATION_TYPE.WARNING)
+      }
+    }
+  }
+}
+</script>
+

mes/qd/src/views/wms/pcs/saleorder/index.vue

@@ -12,7 +12,13 @@
           label-suffix=":"
         >
           <el-form-item label="销售单号">
-            <el-input v-model="query.sale_code" clearable placeholder="销售单号" style="width: 200px;" class="filter-item" />
+            <el-input
+              v-model="query.sale_code"
+              clearable
+              placeholder="销售单号"
+              style="width: 200px;"
+              class="filter-item"
+            />
           </el-form-item>
           <el-form-item label="物料搜索">
             <el-input
@@ -31,7 +37,7 @@
               value-format="yyyy-MM-dd HH:mm:ss"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
-              :default-time="['00:00:00','23:59:59']"
+              :default-time="['00:00:00', '23:59:59']"
               @change="crud.toQuery"
             />
           </el-form-item>
@@ -62,27 +68,20 @@
               placeholder="请选择"
             />
           </el-form-item>
-          <el-form-item label="是否正常">
-            <el-select
-              v-model="query.is_success"
-              style="width: 200px"
-              clearable
-              filterable
-              placeholder="请选择"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.IS_OR_NOT"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
           <rrOperation :crud="crud" />
         </el-form>
       </div>
       <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-upload2"
+          size="mini"
+          @click="uploadShow = true"
+        >
+          导入
+        </el-button>
         <el-button
           slot="right"
           class="filter-item"
@@ -95,42 +94,165 @@
         </el-button>
       </crudOperation>
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" size="mini" label-width="80px">
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="1200px"
+      >
+        <el-form  ref="form" :inline="true" :model="form"   label-width="160px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
+          <el-form-item label="车间" prop="product_area"> <!-- unit_list-->
+            <el-select
+              v-model="form.product_area"
+              placeholder=""
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="销售单号" prop="sale_code">
+            <el-input
+              v-model="form.sale_code"
+              style="width: 200px;"
+            />
+          </el-form-item>
+          <el-form-item label="销售单明细" prop="seq_no">
+            <el-input
+              v-model="form.seq_no"
+              style="width: 200px;"
+            />
+          </el-form-item>
+          <el-form-item label="订单数量" prop="sale_qty">
+            <el-input-number
+              v-model="form.sale_qty"
+              style="width: 200px;"
+            />
+          </el-form-item>
+          <el-form-item label="计量单位" prop="unit_name"> <!-- unit_list-->
+            <el-select
+              v-model="form.qty_unit_id"
+              placeholder=""
+            >
+              <el-option
+                v-for="item in unit_list"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="物料编码" prop="material_code">
+            <el-input
+              v-model="form.material_code"
+              style="width: 200px;"
+            />
+          </el-form-item>
+          <el-form-item label="客户名称" prop="cust_name">
+            <el-select
+              v-model="form.cust_code"
+              placeholder=""
+            >
+              <el-option
+                v-for="item in customer_list"
+                :key="item.label"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="计划交期时间" prop="plandeliver_date">
+            <el-date-picker
+              v-model="form.plandeliver_date"
+              value-format="yyyy-MM-dd"
+              type="date"
+              style="width: 200px;"
+            />
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="form.remark"
+              style="width: 200px;"
+            />
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+          <el-button
+            :loading="crud.cu === 2"
+            type="primary"
+            @click="crud.submitCU"
+          >确认</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="sale_code" label="销售单号" min-width="100" show-overflow-tooltip/>
+        <el-table-column
+          prop="sale_code"
+          label="销售单号"
+          min-width="100"
+          show-overflow-tooltip
+        />
         <el-table-column prop="seq_no" label="明细序号" />
-        <el-table-column prop="sale_type" label="销售单类型" min-width="100" show-overflow-tooltip>
+        <el-table-column
+          prop="sale_type"
+          label="销售单类型"
+          min-width="100"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             {{ dict.label.PCS_SAL_TYPE[scope.row.sale_type] }}
           </template>
         </el-table-column>
         <el-table-column prop="material_code" label="物料编码" />
-        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')"/>
+        <el-table-column
+          prop="material_name"
+          label="物料名称"
+          min-width="100"
+          show-overflow-tooltip
+        />
+        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
         <el-table-column prop="status" label="状态">
           <template slot-scope="scope">
             {{ dict.label.PCS_SALE_STATUS[scope.row.status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="sale_qty" label="销售数量" />
+        <el-table-column prop="sale_qty" label="订单数量" />
+        <el-table-column prop="qty_unit_name" label="计量单位" show-overflow-tooltip min-width="150" />
         <el-table-column prop="produce_seq" label="生产顺序" />
-        <el-table-column prop="cust_code" label="客户编码" :min-width="flexWidth('cust_code',crud.data,'客户编码')"/>
-        <el-table-column prop="cust_name" label="客户名称" :min-width="flexWidth('cust_name',crud.data,'cust_name')"/>
-        <el-table-column prop="unit_name" label="计量单位" show-overflow-tooltip min-width="150"  />
-        <el-table-column prop="plandeliver_date" label="计划交期" min-width="100" show-overflow-tooltip/>
-        <el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="200"/>
+        <el-table-column prop="cust_code" label="客户编码" :min-width="flexWidth('cust_code',crud.data,'客户编码')" />
+        <el-table-column prop="cust_name" label="客户名称" :min-width="flexWidth('cust_name',crud.data,'cust_name')" />
+        <el-table-column prop="plandeliver_date" label="计划交期" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="200" />
         <el-table-column prop="create_name" label="创建人" />
-        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')"/>
-        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')"/>
-<!--        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
+        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
+        <!--        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+        <el-table-column
+          prop="create_time"
+          label="创建时间"
+          min-width="120"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          prop="confirm_time"
+          label="修改时间"
+          min-width="120"
+          show-overflow-tooltip
+        />
+        <!-<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
@@ -142,56 +264,91 @@
       <!--分页组件-->
       <pagination />
     </div>
+    <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3" />
     <Dialog :dialog-show.sync="dialogShow" />
   </div>
 </template>
 
 <script>
-import crudSaleOrder from '@/api/wms/pcs/saleOrder'
+import crudSaleOrder from '@/views/wms/pcs/saleorder/saleOrder'
+import customerbase from '@/api/wms/basedata/master/customerbase'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
+import UploadDialog from '@/views/wms/pcs/saleorder/UploadDialog'
 import Dialog from '@/views/wms/pcs/saleorder/Dialog'
 import pagination from '@crud/Pagination'
-import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudClassstandard from '@/api/wms/basedata/master/classstandard'
 
-const defaultForm = { sale_id: null, sale_code: null, seq_no: null, sale_type: null, material_id: null, status: null, sale_qty: null, produce_seq: null, cust_id: null, qty_unit_id: null, plandeliver_date: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, cust_code: null, cust_name: null }
+const defaultForm = {
+  sale_id: null,
+  sale_code: null,
+  seq_no: null,
+  sale_type: null,
+  material_id: null,
+  status: null,
+  sale_qty: null,
+  produce_seq: null,
+  cust_id: null,
+  qty_unit_id: null,
+  plandeliver_date: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_optid: null,
+  update_optname: null,
+  update_time: null,
+  cust_code: null,
+  cust_name: null
+}
 export default {
   name: 'SaleOrder',
-  dicts: ['PCS_SALE_STATUS', 'PCS_SAL_TYPE', 'IS_OR_NOT'],
-  components: { pagination, crudOperation, rrOperation, Treeselect, Dialog },
+  dicts: ['PCS_SALE_STATUS', 'PCS_SAL_TYPE', 'IS_OR_NOT', 'product_area'],
+  components: { pagination, crudOperation, rrOperation, Treeselect, UploadDialog, Dialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
-    return CRUD({ title: '销售订单', url: 'api/saleOrder', idField: 'sale_id', sort: 'sale_id,desc',
+    return CRUD({
+      title: '销售订单',
+      url: 'api/mpsSaleOrder',
+      idField: 'sale_id',
+      sort: 'sale_id,desc',
       optShow: {
-        add: false,
+        add: true,
         edit: false,
         del: false,
         reset: true,
         download: false
       },
-      crudMethod: { ...crudSaleOrder }})
+      crudMethod: { ...crudSaleOrder }
+    })
   },
   data() {
     return {
+      unit_list: [
+        {value: 16, label: '个\\只'}
+      ],
+      customer_list:[],
       classes3: [],
+      uploadShow: false,
       dialogShow: false,
-      permission: {
-      },
-      queryTypeOptions: [
-        { key: 'sale_code', display_name: '销售单号' }
-      ]
+      permission: {},
+      queryTypeOptions: [{ key: 'sale_code', display_name: '销售单号' }]
     }
   },
   created() {
     this.initClass3()
   },
   methods: {
+    [CRUD.HOOK.beforeToAdd]() {
+      customerbase.selectList().then(res => {
+        this.customer_list = res.content
+     })
+    },
     queryClassId() {
       const param = {
-        'class_idStr': this.class_idStr
+        class_idStr: this.class_idStr
       }
       crudClassstandard.queryClassById(param).then(res => {
         this.classes = res.content.map(obj => {
@@ -205,6 +362,9 @@ export default {
     importin() {
       this.dialogShow = true
     },
+    tableChanged3() {
+      this.crud.toQuery()
+    },
     buildTree(classes) {
       classes.forEach(data => {
         if (data.children) {
@@ -249,6 +409,4 @@ export default {
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

mes/qd/src/views/wms/pcs/saleorder/saleOrder.js

@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/mpsSaleOrder',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/mpsSaleOrder/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/mpsSaleOrder',
+    method: 'put',
+    data
+  })
+}
+
+export function excelImport(data) {
+  return request({
+    url: 'api/mpsSaleOrder/excelImport',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, excelImport }