半成品管理

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

@@ -15,6 +15,8 @@
             style="width: 300px" clearable @change="getList" />
           <ProductSelect v-else-if="queryParams.itemType == 'product'" v-model="queryParams.itemId" :item-type="queryParams.itemType" placeholder="物料信息"
             style="width: 300px" clearable @change="getList" />
+          <SemiSelect v-else-if="queryParams.itemType == 'semi'" v-model="queryParams.itemId" :item-type="queryParams.itemType" placeholder="物料信息"
+            style="width: 300px" clearable @change="getList" />
           <el-input v-else disabled v-model="queryParams.itemId" placeholder="请先选择物料类型" :disabled="true" style="width: 100%;" />
       </el-form-item>
       <el-form-item label="变动时间" prop="changeTime">
@@ -52,7 +54,7 @@
       <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" />
+          <ProductInfo v-else-if="scope.row.itemType == 'product' || scope.row.itemType == 'semi'" :product-id="scope.row.itemId" />
         </template>
       </el-table-column>
       <el-table-column label="物品类型" align="center" prop="itemType">
@@ -129,6 +131,7 @@ 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 SemiSelect from '@/components/KLPService/SemiSelect/index.vue';
 import RawMaterialInfo from '@/components/KLPService/Renderer/RawMaterialInfo.vue';
 import ProductInfo from '@/components/KLPService/Renderer/ProductInfo.vue';
 
@@ -139,7 +142,8 @@ export default {
     RawMaterialSelect,
     ProductSelect,
     RawMaterialInfo,
-    ProductInfo
+    ProductInfo,
+    SemiSelect
   },
   dicts: ['stock_item_type'],
   data() {

klp-ui/src/views/wms/print/scaner.vue

@@ -52,7 +52,7 @@
           <el-table-column prop="time" label="时间" width="180" align="center" />
           <el-table-column prop="itemId" label="物料" align="center">
             <template #default="scope">
-              <ProductInfo v-if="scope.row.itemType === 'product'" :productId="scope.row.itemId" />
+              <ProductInfo v-if="scope.row.itemType == 'product' || scope.row.itemType == 'semi'" :productId="scope.row.itemId" />
               <RawMaterialInfo v-else :materialId="scope.row.itemId" />
             </template>
           </el-table-column>

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

@@ -309,6 +309,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        type: 'product',
         productCode: undefined,
         productName: undefined,
         owner: undefined,

klp-ui/src/views/wms/product/semi.vue

@@ -0,0 +1,490 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="半成品编号" prop="productCode">
+        <el-input
+          v-model="queryParams.productCode"
+          placeholder="请输入半成品编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="半成品名称" prop="productName">
+        <el-input
+          v-model="queryParams.productName"
+          placeholder="请输入半成品名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="负责人" prop="salesManager">
+        <el-input v-model="queryParams.owner" :multiple="false" placeholder="请填写负责人" />
+      </el-form-item>
+      <el-form-item label="基础材质" prop="baseMaterialId">
+        <CategorySelect v-model="queryParams.baseMaterialId" categoryType="base_material" placeholder="请选择基础材质分类" clearable />
+      </el-form-item>
+      <el-form-item label="表面处理" prop="surfaceTreatmentId">
+        <CategorySelect v-model="queryParams.surfaceTreatmentId" categoryType="surface_treatment" placeholder="请选择表面处理分类" clearable />
+      </el-form-item>
+      <el-form-item label="客户需求" prop="customerReqId">
+        <CategorySelect v-model="queryParams.customerReqId" categoryType="customer_req" placeholder="请选择客户需求分类" clearable />
+      </el-form-item>
+      <el-form-item label="包装方式" prop="packagingId">
+        <CategorySelect v-model="queryParams.packagingId" categoryType="spec_packaging" placeholder="请选择包装分类" clearable />
+      </el-form-item>
+      <el-form-item label="是否启用" prop="isEnabled">
+        <el-select v-model="queryParams.isEnabled" placeholder="请选择是否启用" clearable>
+          <el-option
+            v-for="dict in dict.type.common_swicth"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </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="productList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="半成品编号" align="center" prop="productCode" />
+      <el-table-column label="半成品名称" align="center" prop="productName" />
+      <el-table-column label="负责人" align="center" prop="owner" />
+      <el-table-column label="基础材质" align="center">
+        <template slot-scope="scope">
+          <CategoryRenderer :category-id="scope.row.baseMaterialId" />
+        </template>
+      </el-table-column>
+      <el-table-column label="表面处理" align="center">
+        <template slot-scope="scope">
+          <CategoryRenderer :category-id="scope.row.surfaceTreatmentId" />
+        </template>
+      </el-table-column>
+      <el-table-column label="客户需求" align="center">
+        <template slot-scope="scope">
+          <CategoryRenderer :category-id="scope.row.customerReqId" />
+        </template>
+      </el-table-column>
+      <el-table-column label="包装方式" align="center">
+        <template slot-scope="scope">
+          <CategoryRenderer :category-id="scope.row.packagingId" />
+        </template>
+      </el-table-column>
+      <el-table-column label="厚度" align="center" prop="thickness" />
+      <el-table-column label="宽度" align="center" prop="width" />
+      <el-table-column label="内径" align="center" prop="innerDiameter" />
+      <el-table-column label="计量单位" align="center" prop="unit" />
+      <el-table-column label="是否启用" align="center" prop="isEnabled">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.common_swicth" :value="scope.row.isEnabled"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="BOM" align="center">
+        <template slot-scope="scope">
+          <BomInfoMini :bomId="scope.row.bomId" />
+        </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>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-document"
+            @click="goLedger(scope.row)"
+          >台账</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-data-analysis"
+            @click="handleBom(scope.row)"
+          >BOM</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="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-divider>基础信息</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="半成品编号" prop="productCode">
+              <el-input v-model="form.productCode" placeholder="请输入半成品编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="半成品名称" prop="productName">
+              <el-input v-model="form.productName" placeholder="请输入半成品名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人" prop="owner">
+              <el-input v-model="form.owner" :multiple="false" placeholder="请填写负责人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="计量单位" prop="unit">
+              <el-input v-model="form.unit" placeholder="请输入计量单位" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-divider>分类信息</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="基础材质" prop="baseMaterialId">
+              <CategorySelect v-model="form.baseMaterialId" categoryType="base_material" placeholder="请选择基础材质分类" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="表面处理" prop="surfaceTreatmentId">
+              <CategorySelect v-model="form.surfaceTreatmentId" categoryType="surface_treatment" placeholder="请选择表面处理分类" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="客户需求" prop="customerReqId">
+              <CategorySelect v-model="form.customerReqId" categoryType="customer_req" placeholder="请选择客户需求分类" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="包装方式" prop="packagingId">
+              <CategorySelect v-model="form.packagingId" categoryType="spec_packaging" placeholder="请选择包装分类" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-divider>参数信息</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="厚度" prop="thickness">
+              <el-input v-model="form.thickness" placeholder="请输入厚度" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="宽度" prop="width">
+              <el-input v-model="form.width" placeholder="请输入宽度" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="内径" prop="innerDiameter">
+              <el-input v-model="form.innerDiameter" placeholder="请输入内径" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="isEnabled">
+              <el-select v-model="form.isEnabled" placeholder="请选择是否启用" clearable>
+                <el-option
+                  v-for="dict in dict.type.common_swicth"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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>
+
+    <el-dialog title="BOM" @close="bomDialogVisible = false" :visible.sync="bomDialogVisible" width="900px" append-to-body>
+      <BomPanel :id="bomId" type="product" @addBom="handleAddBom" :itemId="itemId" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listProduct, getProduct, delProduct, addProduct, updateProduct } from "@/api/wms/product";
+import CategorySelect from '@/components/KLPService/CategorySelect';
+import CategoryRenderer from '@/components/KLPService/Renderer/CategoryRenderer.vue';
+import UserSelect from '@/components/KLPService/UserSelect';
+import BomPanel from '../bom/components/BomPanel.vue';
+import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue';
+
+export default {
+  name: "Product",
+  components: {
+    CategorySelect,
+    CategoryRenderer,
+    UserSelect,
+    BomPanel,
+    BomInfoMini
+  },
+  dicts: ['common_swicth'],
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 半成品表格数据
+      productList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: 'semi',
+        productCode: undefined,
+        productName: undefined,
+        owner: undefined,
+        baseMaterialId: undefined,
+        surfaceTreatmentId: undefined,
+        customerReqId: undefined,
+        packagingId: undefined,
+        thickness: undefined,
+        width: undefined,
+        innerDiameter: undefined,
+        isEnabled: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        productCode: [
+          { required: true, message: "半成品编号不能为空", trigger: "blur" }
+        ],
+        productName: [
+          { required: true, message: "半成品名称不能为空", trigger: "blur" }
+        ],
+        owner: [
+          { required: true, message: "负责人不能为空", trigger: "blur" }
+        ],
+      },
+      bomDialogVisible: false,
+      bomId: undefined,
+      itemId: undefined,
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询半成品列表 */
+    getList() {
+      this.loading = true;
+      listProduct(this.queryParams).then(response => {
+        this.productList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleAddBom(bom) {
+      console.log('回调触发', bom)
+      this.bomId = bom.bomId;
+      this.getList();
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        productId: undefined,
+        productCode: undefined,
+        productName: undefined,
+        owner: undefined,
+        baseMaterialId: undefined,
+        surfaceTreatmentId: undefined,
+        customerReqId: undefined,
+        packagingId: undefined,
+        thickness: undefined,
+        width: undefined,
+        innerDiameter: undefined,
+        isEnabled: undefined,
+        unit: 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();
+    },
+    goLedger(row) {
+      this.$router.push({
+        path: '/wms/ledger',
+        query: {
+          itemId: row.productId,
+          itemType: 'product'
+        }
+      })
+    },
+    handleBom(row) {
+      this.bomDialogVisible = true;
+      this.bomId = row.bomId;
+      this.itemId = row.productId;
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.productId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加半成品";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const productId = row.productId || this.ids
+      getProduct(productId).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.productId != null) {
+            updateProduct(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+              this.$store.dispatch('category/getProductMap');
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addProduct(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+              this.$store.dispatch('category/getProductMap');
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const productIds = row.productId || this.ids;
+      this.$modal.confirm('是否确认删除半成品编号为"' + productIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delProduct(productIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+        this.$store.dispatch('category/getProductMap');
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wms/product/export', {
+        ...this.queryParams
+      }, `product_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -56,7 +56,7 @@
         </el-table-column>
         <el-table-column label="物品" align="center" prop="itemName">
           <template slot-scope="scope">
-            <ProductInfo v-if="scope.row.itemType === 'product'" :productId="scope.row.itemId">
+            <ProductInfo v-if="scope.row.itemType == 'product' || scope.row.itemType == 'semi'" :productId="scope.row.itemId">
               <template #default="{ product }">
                 {{ product.productName }}({{ product.productCode }})
               </template>