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

klp-ui/src/views/wms/ledger/index.vue

@@ -18,9 +18,10 @@
           <el-input v-else disabled v-model="queryParams.itemId" placeholder="请先选择物料类型" :disabled="true" style="width: 100%;" />
       </el-form-item>
       <el-form-item label="变动时间" prop="changeTime">
-        <el-date-picker clearable
+        <el-date-picker 
+          clearable
           v-model="queryParams.changeTime"
-          type="date"
+          type="daterange"
           value-format="yyyy-MM-dd"
           placeholder="请选择实际库存变动时间">
         </el-date-picker>
@@ -48,8 +49,17 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键ID" align="center" prop="id" v-if="true"/>
       <el-table-column label="仓库/库区/库位ID" align="center" prop="warehouseId" />
-      <el-table-column label="物品ID" align="center" prop="itemId" />
-      <el-table-column label="物品类型" align="center" prop="itemType" />
+      <el-table-column label="物品ID" align="center" prop="itemId">
+        <template slot-scope="scope">
+          <RawMaterialInfo v-if="scope.row.itemType == 'raw_material'" :material-id="scope.row.itemId" />
+          <ProductInfo v-else-if="scope.row.itemType == 'product'" :product-id="scope.row.itemId" />
+        </template>
+      </el-table-column>
+      <el-table-column label="物品类型" align="center" prop="itemType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.stock_item_type" :value="scope.row.itemType" />
+        </template>
+      </el-table-column>
       <el-table-column label="变动数量" align="center" prop="changeQty" />
       <el-table-column label="变动后的库存数量" align="center" prop="afterQty" />
       <el-table-column label="变动类型" align="center" prop="changeType" />
@@ -115,17 +125,21 @@
 </template>
 
 <script>
-import { listStockLog, getStockLog, delStockLog, addStockLog, updateStockLog } from "@/api/wms/stockLog";
+import { listStockLog, getStockLog, updateStockLog } from "@/api/wms/stockLog";
 import WarehouseSelect from '@/components/KLPService/WarehouseSelect/index.vue';
 import RawMaterialSelect from '@/components/KLPService/RawMaterialSelect/index.vue';
 import ProductSelect from '@/components/KLPService/ProductSelect/index.vue';
+import RawMaterialInfo from '@/components/KLPService/Renderer/RawMaterialInfo.vue';
+import ProductInfo from '@/components/KLPService/Renderer/ProductInfo.vue';
 
 export default {
   name: "StockLog",
   components: {
     WarehouseSelect,
     RawMaterialSelect,
-    ProductSelect
+    ProductSelect,
+    RawMaterialInfo,
+    ProductInfo
   },
   dicts: ['stock_item_type'],
   data() {
@@ -182,7 +196,12 @@ export default {
     /** 查询库存流水列表 */
     getList() {
       this.loading = true;
-      listStockLog(this.queryParams).then(response => {
+      const payload = {
+        ...this.queryParams,
+        startTime: this.queryParams.changeTime ? this.queryParams.changeTime[0] + ' 00:00:00' : undefined,
+        endTime: this.queryParams.changeTime ? this.queryParams.changeTime[1] + ' 23:59:59' : undefined
+      }
+      listStockLog(payload).then(response => {
         this.stockLogList = response.rows;
         this.total = response.total;
         this.loading = false;

klp-ui/src/views/wms/purchasePlan/status.vue

@@ -0,0 +1,361 @@
+<template>
+  <div class="app-container">
+    <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>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-close"
+          size="mini"
+          @click="handleClose"
+        >关闭</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="字典编码" align="center" prop="dictCode" />
+      <el-table-column label="字典标签" align="center" prop="dictLabel">
+        <template slot-scope="scope">
+          <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.dictLabel}}</span>
+          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.dictLabel}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="字典键值" align="center" prop="dictValue" />
+      <el-table-column label="字典排序" align="center" prop="dictSort" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</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="字典类型">
+          <el-input v-model="form.dictType" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="数据标签" prop="dictLabel">
+          <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
+        </el-form-item>
+        <el-form-item label="数据键值" prop="dictValue">
+          <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
+        </el-form-item>
+        <el-form-item label="样式属性" prop="cssClass">
+          <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
+        </el-form-item>
+        <el-form-item label="显示排序" prop="dictSort">
+          <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="回显样式" prop="listClass">
+          <el-select v-model="form.listClass">
+            <el-option
+              v-for="item in listClassOptions"
+              :key="item.value"
+              :label="item.label + '(' + item.value + ')'"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
+import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
+
+export default {
+  name: "Data",
+  dicts: ['sys_normal_disable'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典表格数据
+      dataList: [],
+      // 默认字典类型
+      defaultDictType: "",
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 数据标签回显样式
+      listClassOptions: [
+        {
+          value: "default",
+          label: "默认"
+        },
+        {
+          value: "primary",
+          label: "主要"
+        },
+        {
+          value: "success",
+          label: "成功"
+        },
+        {
+          value: "info",
+          label: "信息"
+        },
+        {
+          value: "warning",
+          label: "警告"
+        },
+        {
+          value: "danger",
+          label: "危险"
+        }
+      ],
+      // 类型数据字典
+      typeOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        dictName: undefined,
+        dictType: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        dictLabel: [
+          { required: true, message: "数据标签不能为空", trigger: "blur" }
+        ],
+        dictValue: [
+          { required: true, message: "数据键值不能为空", trigger: "blur" }
+        ],
+        dictSort: [
+          { required: true, message: "数据顺序不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    const dictId = '1946447341556719617';
+    this.getType(dictId);
+    this.getTypeList();
+  },
+  methods: {
+    /** 查询字典类型详细 */
+    getType(dictId) {
+      getType(dictId).then(response => {
+        this.queryParams.dictType = response.data.dictType;
+        this.defaultDictType = response.data.dictType;
+        this.getList();
+      });
+    },
+    /** 查询字典类型列表 */
+    getTypeList() {
+      getDictOptionselect().then(response => {
+        this.typeOptions = response.data;
+      });
+    },
+    /** 查询字典数据列表 */
+    getList() {
+      this.loading = true;
+      listData(this.queryParams).then(response => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        dictCode: undefined,
+        dictLabel: undefined,
+        dictValue: undefined,
+        cssClass: undefined,
+        listClass: 'default',
+        dictSort: 0,
+        status: "0",
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 返回按钮操作 */
+    handleClose() {
+      const obj = { path: "/system/dict" };
+      this.$tab.closeOpenPage(obj);
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.dictType = this.defaultDictType;
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加字典数据";
+      this.form.dictType = this.queryParams.dictType;
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.dictCode)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const dictCode = row.dictCode || this.ids
+      getData(dictCode).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改字典数据";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.dictCode != undefined) {
+            updateData(this.form).then(response => {
+              this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addData(this.form).then(response => {
+              this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const dictCodes = row.dictCode || this.ids;
+      this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() {
+        return delData(dictCodes);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+        this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/dict/data/export', {
+        ...this.queryParams
+      }, `data_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

klp-ui/src/views/wms/stockIo/panels/stockIoPage.vue

@@ -9,16 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="类型" prop="ioType">
-        <el-select v-model="queryParams.ioType" placeholder="请选择类型" clearable>
-          <el-option
-            v-for="dict in dict.type.stock_io_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item> -->
       <el-form-item label="业务类型" prop="bizType">
         <el-select v-model="queryParams.bizType" placeholder="请选择业务类型" clearable>
           <el-option
@@ -135,12 +125,6 @@
             icon="el-icon-document"
             @click="showDetail(scope.row)"
           >明细</el-button>
-          <!-- <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-printer"
-            @click="handleShowBarcodeDrawer(scope.row)"
-          >打印条码</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -159,16 +143,6 @@
         <el-form-item label="出入库单号" prop="stockIoCode">
           <el-input v-model="form.stockIoCode" placeholder="请输入出入库单号" />
         </el-form-item>
-        <!-- <el-form-item label="类型" prop="ioType">
-          <el-select v-model="form.ioType" placeholder="请选择类型">
-            <el-option
-              v-for="dict in dict.type.stock_io_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item label="业务类型" prop="bizType">
           <el-select v-model="form.bizType" placeholder="请选择业务类型">
             <el-option
@@ -204,35 +178,17 @@
         @status-changed="onStatusChanged"
       />
     </el-dialog>
-    <!-- 条码打印抽屉 -->
-    <!-- <el-drawer
-      title="条码打印"
-      :visible.sync="drawerBarcodeVisible"
-      size="100%"
-      direction="btt"
-      :with-header="true"
-    >
-      <BarcodeGenerator
-        v-if="drawerBarcodeVisible"
-        :barcodes="drawerBarcodeData.barcodes"
-        :perRow="drawerBarcodeData.perRow"
-        :barcodeWidth="drawerBarcodeData.barcodeWidth"
-        :barcodeHeight="drawerBarcodeData.barcodeHeight"
-      />
-    </el-drawer> -->
   </div>
 </template>
 
 <script>
 import { listStockIo, getStockIo, delStockIo, addStockIo, updateStockIo } from "@/api/wms/stockIo";
-import { listStockIoDetail } from "@/api/wms/stockIoDetail";
 import StockIoDetailPanel from './detail.vue';
-import BarcodeGenerator from './barcode.vue';
 
 export default {
   name: "StockIo",
-  dicts: ['stock_biz_type', 'stock_io_type', 'stock_status'],
-  components: { StockIoDetailPanel, BarcodeGenerator },
+  dicts: ['stock_biz_type', 'stock_status'],
+  components: { StockIoDetailPanel },
   props: {
     ioType: {
       require: true
@@ -279,9 +235,6 @@ export default {
         stockIoCode: [
           { required: true, message: "出入库单号不能为空", trigger: "blur" }
         ],
-        // ioType: [
-        //   { required: true, message: "类型不能为空", trigger: "change" }
-        // ],
         bizType: [
           { required: true, message: "业务类型不能为空", trigger: "change" }
         ],
@@ -300,14 +253,6 @@ export default {
       },
       detailDialogVisible: false,
       detailStockIo: null,
-      // 条码打印抽屉相关
-      // drawerBarcodeVisible: false,
-      // drawerBarcodeData: {
-      //   barcodes: [],
-      //   perRow: 3,
-      //   barcodeWidth: 180,
-      //   barcodeHeight: 60
-      // },
     };
   },
   created() {
@@ -442,22 +387,6 @@ export default {
       // 刷新列表
       this.getList();
     },
-    // async handleShowBarcodeDrawer(row) {
-    //   // 获取明细列表
-    //   const res = await listStockIoDetail({ stockIoId: row.stockIoId });
-    //   const details = res.data || res.rows || [];
-    //   // 拼接条码内容 stockIoId_warehouseId_materialId_quantity
-    //   const barcodes = details.filter(el => el.recordType == 0).map(item => {
-    //     return encodeURIComponent(`${row.stockIoId}_${item.warehouseId || ''}_${item.itemId || ''}_${item.quantity || ''}`);
-    //   });
-    //   // this.drawerBarcodeData = {
-    //   //   barcodes,
-    //   //   perRow: 3,
-    //   //   barcodeWidth: 180,
-    //   //   barcodeHeight: 60
-    //   // };
-    //   // this.drawerBarcodeVisible = true;
-    // },
     getIoTypeTagType(type) {
       if (type === 'in') return 'success';
       if (type === 'out') return 'primary';

klp-ui/src/views/wms/stockIo/return.vue

@@ -0,0 +1,13 @@
+<template>
+  <StockIoPage ioType="return" />
+</template>
+
+<script>
+  import StockIoPage from './panels/stockIoPage.vue';
+
+  export default {
+    components: {
+      StockIoPage
+    }
+  }
+</script>

klp-wms/src/main/java/com/klp/controller/WmsStockIoController.java

@@ -151,6 +151,7 @@ public class WmsStockIoController extends BaseController {
                                 @RequestParam Integer status) {
         return toAjax(iWmsStockIoService.updateStatus(stockIoId, status));
     }
+
     /**
      * 扫码枪专用：根据明细ID直接入库，无需审核整单
      */

klp-wms/src/main/java/com/klp/service/impl/WmsStockIoServiceImpl.java

@@ -19,14 +19,14 @@ import com.klp.service.IWmsStockIoService;
 import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
+
 import com.klp.common.exception.ServiceException;
 import com.klp.domain.bo.WmsStockIoWithDetailBo;
 import com.klp.domain.bo.WmsStockIoDetailBo;
 
+import javax.annotation.Resource;
+
 /**
  * 出入库单主Service业务层处理
  *
@@ -42,6 +42,8 @@ public class WmsStockIoServiceImpl implements IWmsStockIoService {
     private final WmsStockMapper stockMapper;
     private final WmsProductMapper productMapper;
     private final WmsRawMaterialMapper rawMaterialMapper;
+    @Resource
+    private WmsStockLogMapper stockLogMapper;
 
     /**
      * 查询出入库单主
@@ -225,8 +227,7 @@ public class WmsStockIoServiceImpl implements IWmsStockIoService {
         }
         // 更新单据状态为已审核（2）
         stockIo.setStatus(2);
-        baseMapper.updateById(stockIo);
-        return true;
+        return baseMapper.updateById(stockIo) > 0;
     }
 
     /**
@@ -360,5 +361,18 @@ public class WmsStockIoServiceImpl implements IWmsStockIoService {
             stock.setQuantity(newQty);
             stockMapper.updateById(stock);
         }
+        // 记录库存变更日志
+        WmsStockLog log = new WmsStockLog();
+        log.setWarehouseId(warehouseId);
+        log.setItemType(itemType);
+        log.setItemId(itemId);
+        // 变动数量（正=入库，负=出库）
+        log.setChangeQty(isAdd ? quantity : quantity.negate());
+        // 变动后的库存数量
+        log.setAfterQty(stock.getQuantity());
+        // 变动类型（入库/出库等）
+        log.setChangeType(isAdd ? "入库" : "出库");
+        log.setChangeTime(new Date());
+        stockLogMapper.insert(log);
     }
 }