From ab2bb2f621ff459245aafb2a93cd21bf18137b23 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Tue, 30 Apr 2024 18:19:08 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xz/controller/XzMaterialController.java   | 23 ++++++++++++++++---
 .../xmgl/modules/xz/entity/XzMaterial.java    |  9 ++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
index 67253ac1a..cc238a5ad 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
@@ -1,5 +1,6 @@
 package com.zhgd.xmgl.modules.xz.controller;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -163,10 +164,26 @@ public class XzMaterialController {
     @PostMapping(value = "/save")
     public Result<Object> save(@RequestBody JSONObject obj) {
         log.info("添加材料信息" + JSON.toJSONString(obj));
+        List<String> enterpriseIds = (List<String>) obj.get("enterpriseId");
         XzMaterial xzMaterial = new XzMaterial();
         String [] param = {"name", "model", "specifications", "unit", "num", "remark"};
         List<XzMaterialDetail> list = new ArrayList<>();
-        xzMaterial.setName(obj.getString("name"));
+        XzMaterial exist = xzMaterialService.getOne(Wrappers.<XzMaterial>lambdaQuery()
+                .like(XzMaterial::getName, DateUtil.today())
+                .orderByDesc(XzMaterial::getCreateTime).last("limit 1"));
+        if (exist == null) {
+            xzMaterial.setName(DateUtil.today() + "/01批次");
+            xzMaterial.setNum(1);
+        } else {
+            Integer index = exist.getNum();
+            index = index + 1;
+            if (index < 10) {
+                xzMaterial.setName(DateUtil.today() + "/第0" + index + "批次");
+            } else {
+                xzMaterial.setName(DateUtil.today() + "/第" + index + "批次");
+            }
+            xzMaterial.setNum(index);
+        }
         xzMaterial.setEntryTime(obj.getDate("entryTime"));
         JSONArray detail = obj.getJSONArray("detail");
         if (detail != null) {
@@ -183,11 +200,11 @@ public class XzMaterialController {
             }
         }
         xzMaterial.setProjectSn(obj.getString("projectSn"));
-        List<String> enterpriseIds = (List<String>) obj.get("enterpriseId");
-        if (enterpriseIds != null && enterpriseIds.size() >0) {
+        if (enterpriseIds != null && enterpriseIds.size() > 0) {
             xzMaterial.setEnterpriseId(enterpriseIds.get(0));
         }
         xzMaterial.setXzMaterialList(list);
+        xzMaterial.setCreateTime(new Date());
         xzMaterialService.saveInfo(xzMaterial);
         return Result.success("添加成功！");
     }
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java
index 489c3ecdb..d5a820c34 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java
@@ -39,6 +39,12 @@ public class XzMaterial implements Serializable {
     @Excel(name = "批次名称", width = 15)
     @ApiModelProperty(value = "批次名称")
     private String name;
+    /**
+     * 批次数量
+     */
+    @Excel(name = "批次数量", width = 15)
+    @ApiModelProperty(value = "批次数量")
+    private Integer num;
     /**
      * 入场时间
      */
@@ -58,6 +64,9 @@ public class XzMaterial implements Serializable {
     @ApiModelProperty(value = "企业id")
     private String enterpriseId;
 
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "企业名称")
     private String enterpriseName;