From 297469abf2e5332dd776b822f6d2360f126f22bc Mon Sep 17 00:00:00 2001
From: rgc <rgc@123.com>
Date: Wed, 26 Feb 2025 14:02:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=A1=A3=E6=A1=88=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/basic/article/index.vue         | 83 +++++++++++++++----
 .../basic/controller/TbArticleController.java | 31 ++++++-
 .../java/com/wms/basic/domain/TbArticle.java  | 25 +++++-
 .../com/wms/basic/domain/TbArticleExt.java    |  2 +-
 4 files changed, 122 insertions(+), 19 deletions(-)

diff --git a/wms-basic-ui/src/views/basic/article/index.vue b/wms-basic-ui/src/views/basic/article/index.vue
index a1aa49d..e11b821 100644
--- a/wms-basic-ui/src/views/basic/article/index.vue
+++ b/wms-basic-ui/src/views/basic/article/index.vue
@@ -74,17 +74,17 @@
       <el-table-column label="物料编码" align="center" prop="articleId" width="180"/>
       <el-table-column label="物料名称" align="center" prop="articleName" width="180"/>
       <el-table-column label="品牌" align="center" prop="articleBrand" width="180"/>
-      <el-table-column label="data1" align="center" prop="data1" width="180"/>
-      <el-table-column label="data2" align="center" prop="data2" width="180"/>
-      <el-table-column label="data3" align="center" prop="data3" width="180"/>
-      <el-table-column label="data4" align="center" prop="data4" width="180"/>
-      <el-table-column label="data5" align="center" prop="data5" width="180"/>
-      <el-table-column label="data6" align="center" prop="data6" width="180"/>
-      <el-table-column label="data7" align="center" prop="data7" width="180"/>
-      <el-table-column label="data8" align="center" prop="data8" width="180"/>
-      <el-table-column label="data9" align="center" prop="data9" width="180"/>
-      <el-table-column label="data10" align="center" prop="data10" width="180"/>
-      <el-table-column label="data11" align="center" prop="data11" width="180"/>
+      <el-table-column label="计量单位" align="center" prop="data1" width="180"/>
+      <el-table-column label="物料分组" align="center" prop="data2" width="180"/>
+      <el-table-column label="规格" align="center" prop="data3" width="180"/>
+      <el-table-column label="物料类型" align="center" prop="data4" width="180"/>
+      <el-table-column label="管理仓库" align="center" prop="data5" width="180"/>
+      <el-table-column label="安全库存" align="center" prop="data6" width="180"/>
+      <el-table-column label="包装单位" align="center" prop="data7" width="180"/>
+      <el-table-column label="包装容量" align="center" prop="data8" width="180"/>
+      <!--      <el-table-column label="data9" align="center" prop="data9" width="180"/>-->
+      <!--      <el-table-column label="data10" align="center" prop="data10" width="180"/>-->
+      <!--      <el-table-column label="data11" align="center" prop="data11" width="180"/>-->
       <el-table-column label="创建人" align="center" prop="createBy" width="180"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
@@ -130,16 +130,40 @@
     <el-dialog :close-on-click-modal="false":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="articleId">
-            <el-input v-model="form.articleId" placeholder="请输入物料编码" :disabled="disable"/>
+          <el-input v-model="form.articleId" placeholder="请输入物料编码" :disabled="disable"/>
         </el-form-item>
         <el-form-item label="物料名称" prop="articleName">
-            <el-input v-model="form.articleName" placeholder="请输入物料名称"/>
+          <el-input v-model="form.articleName" placeholder="请输入物料名称"/>
         </el-form-item>
         <el-form-item label="品牌" prop="articleBrand">
-            <el-input v-model="form.articleBrand" placeholder="请输入品牌"/>
+          <el-input v-model="form.articleBrand" placeholder="请输入品牌"/>
+        </el-form-item>
+        <el-form-item label="计量单位" prop="data1">
+          <el-input v-model="form.data1" placeholder="请输入计量单位" :disabled="disable"/>
+        </el-form-item>
+        <el-form-item label="物料分组" prop="data2">
+          <el-input v-model="form.data2" placeholder="请输入物料分组" :disabled="disable"/>
+        </el-form-item>
+        <el-form-item label="规格" prop="data3">
+          <el-input v-model="form.data3" placeholder="请输入规格" :disabled="disable"/>
+        </el-form-item>
+        <el-form-item label="物料类型" prop="data4">
+          <el-input v-model="form.data4" placeholder="请输入物料类型" :disabled="disable"/>
+        </el-form-item>
+        <el-form-item label="管理仓库" prop="data5">
+          <el-input v-model="form.data5" placeholder="请输入管理仓库" :disabled="disable"/>
+        </el-form-item>
+        <el-form-item label="安全库存" prop="data6">
+          <el-input-number v-model="form.data6" placeholder="请输入安全库存" :disabled="disable"/>
+        </el-form-item>
+        <el-form-item label="包装单位" prop="data7">
+          <el-input v-model="form.data7" placeholder="请输入包装单位" :disabled="disable"/>
+        </el-form-item>
+        <el-form-item label="包装容量" prop="data8">
+          <el-input-number v-model="form.data8" placeholder="请输入包装容量" :disabled="disable"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" placeholder="请输入备注"/>
+          <el-input v-model="form.remark" placeholder="请输入备注"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -196,6 +220,27 @@ export default {
         articleName: [
           { required: true, message: "物料名称不能为空", trigger: "blur" }
         ],
+        data1: [
+          { required: true, message: "计量单位不能为空", trigger: "blur" }
+        ],
+        data2: [
+          { required: true, message: "物料分组不能为空", trigger: "blur" }
+        ],
+        data3: [
+          { required: true, message: "规格不能为空", trigger: "blur" }
+        ],
+        data4: [
+          { required: true, message: "物料类型不能为空", trigger: "blur" }
+        ],
+        data5: [
+          { required: true, message: "管理仓库不能为空", trigger: "blur" }
+        ],
+        data7: [
+          { required: true, message: "包装单位不能为空", trigger: "blur" }
+        ],
+        data8: [
+          { required: true, message: "包装容量不能为空", trigger: "blur" }
+        ],
       }
     };
   },
@@ -223,6 +268,14 @@ export default {
         articleId: null,
         articleName: null,
         articleBrand: null,
+        data1: null,
+        data2: null,
+        data3: null,
+        data4: null,
+        data5: 'CF321',
+        data6: null,
+        data7: null,
+        data8: null,
         remark: null,
         createBy: null,
         createTime: null,
diff --git a/wms-basic/src/main/java/com/wms/basic/controller/TbArticleController.java b/wms-basic/src/main/java/com/wms/basic/controller/TbArticleController.java
index 1d84208..c869481 100644
--- a/wms-basic/src/main/java/com/wms/basic/controller/TbArticleController.java
+++ b/wms-basic/src/main/java/com/wms/basic/controller/TbArticleController.java
@@ -5,12 +5,14 @@ import com.wms.basic.domain.TbArticle;
 import com.wms.basic.domain.TbArticleExt;
 import com.wms.basic.domain.result.BasicArticle;
 import com.wms.basic.mapper.TbArticleMapper;
+import com.wms.basic.service.ITbArticleExtService;
 import com.wms.basic.service.ITbArticleService;
 import com.wms.common.annotation.Log;
 import com.wms.common.core.controller.BaseController;
 import com.wms.common.core.domain.AjaxResult;
 import com.wms.common.core.page.TableDataInfo;
 import com.wms.common.enums.BusinessType;
+import com.wms.common.utils.DateUtils;
 import com.wms.common.utils.StringUtils;
 import com.wms.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
@@ -21,8 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -39,7 +43,8 @@ public class TbArticleController extends BaseController {
 
     private final ITbArticleService tbArticleService;
     private final TbArticleMapper articleMapper;
-
+    @Resource
+    private ITbArticleExtService articleExtService;
 
     /**
      * 查询商品档案列表
@@ -100,7 +105,17 @@ public class TbArticleController extends BaseController {
     @PreAuthorize("@ss.hasPermi('basic:article:query')")
     @GetMapping(value = "/{articleId}")
     public AjaxResult getInfo(@ApiParam(value = "主键", required = true) @PathVariable("articleId") String articleId) {
-        return AjaxResult.success(tbArticleService.getById(articleId));
+        final TbArticle tbArticle = tbArticleService.getById(articleId);
+        final TbArticleExt articleExt = articleExtService.getById(articleId);
+        tbArticle.setData1(articleExt.getData1());
+        tbArticle.setData2(articleExt.getData2());
+        tbArticle.setData3(articleExt.getData3());
+        tbArticle.setData4(articleExt.getData4());
+        tbArticle.setData5(articleExt.getData5());
+        tbArticle.setData6(articleExt.getData6());
+        tbArticle.setData7(articleExt.getData7());
+        tbArticle.setData8(articleExt.getData8());
+        return AjaxResult.success(tbArticle);
     }
 
     /**
@@ -111,6 +126,18 @@ public class TbArticleController extends BaseController {
     @Log(title = "商品档案", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TbArticle tbArticle) {
+        final TbArticleExt articleExt = TbArticleExt.builder().articleId(tbArticle.getArticleId())
+                .data1(tbArticle.getData1())
+                .data2(tbArticle.getData2())
+                .data3(tbArticle.getData3())
+                .data4(tbArticle.getData4())
+                .data5(tbArticle.getData5())
+                .data6(tbArticle.getData6())
+                .data7(tbArticle.getData7())
+                .data8(tbArticle.getData8())
+                .data9(DateUtils.getNowDate())
+                .build();
+        articleExtService.save(articleExt);
         return toAjax(tbArticleService.save(tbArticle));
     }
 
diff --git a/wms-basic/src/main/java/com/wms/basic/domain/TbArticle.java b/wms-basic/src/main/java/com/wms/basic/domain/TbArticle.java
index 9d47664..cc90a3b 100644
--- a/wms-basic/src/main/java/com/wms/basic/domain/TbArticle.java
+++ b/wms-basic/src/main/java/com/wms/basic/domain/TbArticle.java
@@ -18,7 +18,7 @@ import java.util.Date;
 
 /**
  * 商品档案对象 tb_basic_article
- * 
+ *
  * @author zf
  * @date 2024-01-10
  */
@@ -52,12 +52,20 @@ public class TbArticle extends BaseEntityPlus implements Serializable{
     @Excel(name = "备注")
     private String remark;
 
+    /** 计量单位 */
+    @ApiModelProperty("计量单位")
+    @TableField(exist = false)
+    private String data1;
 
     /** 物料分组 */
     @ApiModelProperty("物料分组")
     @TableField(exist = false)
     private String data2;
 
+    /** 规格 */
+    @ApiModelProperty("规格")
+    @TableField(exist = false)
+    private String data3;
 
     /** 物料类型 */
     @ApiModelProperty("物料类型")
@@ -69,5 +77,20 @@ public class TbArticle extends BaseEntityPlus implements Serializable{
     @TableField(exist = false)
     private String data5;
 
+    /** 安全库存 */
+    @ApiModelProperty("安全库存")
+    @TableField(exist = false)
+    private BigDecimal data6;
+
+    /** 包装单位 */
+    @ApiModelProperty("包装单位")
+    @TableField(exist = false)
+    private String data7;
+
+    /** 包装容量 */
+    @ApiModelProperty("包装容量")
+    @TableField(exist = false)
+    private BigDecimal data8;
+
 
 }
diff --git a/wms-basic/src/main/java/com/wms/basic/domain/TbArticleExt.java b/wms-basic/src/main/java/com/wms/basic/domain/TbArticleExt.java
index 59420c5..d05b5bd 100644
--- a/wms-basic/src/main/java/com/wms/basic/domain/TbArticleExt.java
+++ b/wms-basic/src/main/java/com/wms/basic/domain/TbArticleExt.java
@@ -19,7 +19,7 @@ import java.util.Date;
 
 /**
  * 物料扩展对象 tb_basic_article_ext
- * 
+ *
  * @author wms
  * @date 2024-01-10
  */