Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/api/wms/deliveryPlan.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询发货计划列表
+export function listDeliveryPlan(query) {
+  return request({
+    url: '/wms/deliveryPlan/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询发货计划详细
+export function getDeliveryPlan(planId) {
+  return request({
+    url: '/wms/deliveryPlan/' + planId,
+    method: 'get'
+  })
+}
+
+// 新增发货计划
+export function addDeliveryPlan(data) {
+  return request({
+    url: '/wms/deliveryPlan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改发货计划
+export function updateDeliveryPlan(data) {
+  return request({
+    url: '/wms/deliveryPlan',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除发货计划
+export function delDeliveryPlan(planId) {
+  return request({
+    url: '/wms/deliveryPlan/' + planId,
+    method: 'delete'
+  })
+}

klp-ui/src/api/wms/deliveryWaybill.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询发货单主列表
+export function listDeliveryWaybill(query) {
+  return request({
+    url: '/wms/deliveryWaybill/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询发货单主详细
+export function getDeliveryWaybill(waybillId) {
+  return request({
+    url: '/wms/deliveryWaybill/' + waybillId,
+    method: 'get'
+  })
+}
+
+// 新增发货单主
+export function addDeliveryWaybill(data) {
+  return request({
+    url: '/wms/deliveryWaybill',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改发货单主
+export function updateDeliveryWaybill(data) {
+  return request({
+    url: '/wms/deliveryWaybill',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除发货单主
+export function delDeliveryWaybill(waybillId) {
+  return request({
+    url: '/wms/deliveryWaybill/' + waybillId,
+    method: 'delete'
+  })
+}

klp-ui/src/api/wms/deliveryWaybillDetail.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询发货单明细列表
+export function listDeliveryWaybillDetail(query) {
+  return request({
+    url: '/wms/deliveryWaybillDetail/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询发货单明细详细
+export function getDeliveryWaybillDetail(detailId) {
+  return request({
+    url: '/wms/deliveryWaybillDetail/' + detailId,
+    method: 'get'
+  })
+}
+
+// 新增发货单明细
+export function addDeliveryWaybillDetail(data) {
+  return request({
+    url: '/wms/deliveryWaybillDetail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改发货单明细
+export function updateDeliveryWaybillDetail(data) {
+  return request({
+    url: '/wms/deliveryWaybillDetail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除发货单明细
+export function delDeliveryWaybillDetail(detailId) {
+  return request({
+    url: '/wms/deliveryWaybillDetail/' + detailId,
+    method: 'delete'
+  })
+}

klp-ui/src/views/wms/coil/actflow.vue

@@ -82,6 +82,7 @@
              <span v-else-if="scope.row.actionType===401">入库操作</span>
              <span v-else-if="scope.row.actionType===402">发货操作</span>
              <span v-else-if="scope.row.actionType===403">移库操作</span>
+             <span v-else-if="scope.row.actionType===404">通过库区编辑钢卷</span>
           <dict-tag v-else :options='dict.type.action_type' :value="scope.row.actionType "></dict-tag>
         </template>
       </el-table-column>

klp-ui/src/views/wms/coil/do/ship.vue

@@ -193,7 +193,7 @@
 </template>
 
 <script>
-import { updateMaterialCoil, getMaterialCoil } from '@/api/wms/coil'
+import { updateMaterialCoilSimple, getMaterialCoil } from '@/api/wms/coil'
 import { listPendingAction, addPendingAction } from '@/api/wms/pendingAction'
 import MaterialSelect from "@/components/KLPService/MaterialSelect";
 import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
@@ -313,7 +313,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
-          updateMaterialCoil({
+          updateMaterialCoilSimple({
             ...this.form,
             coilId: this.form.coilId,
             status: 1

klp-ui/src/views/wms/delivery/plan/index.vue

@@ -0,0 +1,296 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="计划名称" prop="planName">
+        <el-input
+          v-model="queryParams.planName"
+          placeholder="请输入发货计划名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计划日期" prop="planDate">
+        <el-date-picker clearable
+          v-model="queryParams.planDate"
+          type="date"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="请选择计划日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="deliveryPlanList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="计划唯一ID" align="center" prop="planId" v-if="false"/>
+      <el-table-column label="发货计划名称" align="center" prop="planName" />
+      <el-table-column label="计划日期" align="center" prop="planDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改发货计划对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="发货计划名称" prop="planName">
+          <el-input v-model="form.planName" placeholder="请输入发货计划名称" />
+        </el-form-item>
+        <el-form-item label="计划日期" prop="planDate">
+          <el-date-picker clearable
+            v-model="form.planDate"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择计划日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDeliveryPlan, getDeliveryPlan, delDeliveryPlan, addDeliveryPlan, updateDeliveryPlan } from "@/api/wms/deliveryPlan";
+
+export default {
+  name: "DeliveryPlan",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 发货计划表格数据
+      deliveryPlanList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        planName: undefined,
+        planDate: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询发货计划列表 */
+    getList() {
+      this.loading = true;
+      listDeliveryPlan(this.queryParams).then(response => {
+        this.deliveryPlanList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        planId: undefined,
+        planName: undefined,
+        planDate: undefined,
+        remark: undefined,
+        delFlag: undefined,
+        createTime: undefined,
+        createBy: undefined,
+        updateTime: undefined,
+        updateBy: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.planId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      // this.reset();
+      // 默认选中今天的日期和时间, 格式化未yyyy-MM-dd HH:mm:ss
+      this.form.planDate = new Date().toLocaleString().replace('T', ' ').replace().replace(/\//g, '-')
+      // 发货计划名称格式为年-月-日命名
+      this.form.planName = new Date().toLocaleDateString().replace(/\//g, '-') + '发货计划'
+      this.open = true;
+      this.title = "添加发货计划";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const planId = row.planId || this.ids
+      getDeliveryPlan(planId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改发货计划";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.planId != null) {
+            updateDeliveryPlan(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addDeliveryPlan(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const planIds = row.planId || this.ids;
+      this.$modal.confirm('是否确认删除发货计划编号为"' + planIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delDeliveryPlan(planIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wms/deliveryPlan/export', {
+        ...this.queryParams
+      }, `deliveryPlan_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>