From 4616e83a89fd98e47fd2733ff8b55de284b5cd6e Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Thu, 27 Mar 2025 11:56:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E9=98=B3-=E6=96=B0=E5=A2=9E=E5=85=A5?=
 =?UTF-8?q?=E9=99=A2=E4=BA=A7=E5=93=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thrsys/impl/ThrProductsAddDiService.java  | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java
index 17b838d1..cd5c7462 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java
@@ -68,7 +68,6 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
     }
 
 
-
     public boolean exits(String devKey) {
         return thrProductsAddDiDao.exists(new QueryWrapper<ThrProductsAddDiEntity>().eq("deviceRecordKey", devKey));
     }
@@ -131,9 +130,9 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
             thrProductsAddDiEntity.setUpdateTime(new Date());
             thrProductsAddDiEntity.setStatus(1); //..
             thrProductsAddDiEntity.setSelectThridSysStr(JSONUtil.toJsonStr(thrDiProductsRequest.getSelectThirdSys()));
-            if (thrDiProductsRequest.getProductsType() == null){
+            if (thrDiProductsRequest.getProductsType() == null) {
                 thrProductsAddDiEntity.setProductsType(2);
-            }else {
+            } else {
                 thrProductsAddDiEntity.setProductsType(thrDiProductsRequest.getProductsType());
             }
 
@@ -152,7 +151,7 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
 
 
             }
-            String internalMaterialCode = this.getInternalMaterialCode("10","66");
+            String internalMaterialCode = this.getInternalMaterialCode("10", "66");
             thrProductsAddDiEntity.setInternalMaterialCode(internalMaterialCode);
             list.add(thrProductsAddDiEntity);
         }
@@ -232,7 +231,7 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
                 log.info("本次成功入：" + voList.size() + "条,数据如下---------------");
                 voList.forEach(excelVo -> {
                     ThrProductsAddDiEntity thrProductsAdddiEntity = new ThrProductsAddDiEntity();
-                    String internalMaterialCode = thrProductsAddDiService.getInternalMaterialCode("10","66");
+                    String internalMaterialCode = thrProductsAddDiService.getInternalMaterialCode("10", "66");
                     thrProductsAdddiEntity.setInternalMaterialCode(internalMaterialCode);
                     thrProductsAdddiEntity.setCode(internalMaterialCode);
                     thrProductsAdddiEntity.setThirdSysFk("thirdId");
@@ -274,12 +273,19 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
                     if (StrUtil.isNotEmpty(excelVo.getPurType())) {
                         if (excelVo.getPurType().contains("入账")) {
                             thrProductsAdddiEntity.setPurType(1);
-                        }else if (excelVo.getPurType().contains("预验收")) {
+                        } else if (excelVo.getPurType().contains("预验收")) {
                             thrProductsAdddiEntity.setPurType(2);
-                        }else if (excelVo.getPurType().contains("寄售")) {
+                        } else if (excelVo.getPurType().contains("寄售")) {
                             thrProductsAdddiEntity.setPurType(3);
                         }
                     }
+                    if (StrUtil.isNotEmpty(excelVo.getAttributeType())) {
+                        if (excelVo.getAttributeType().equals("耗材")) {
+                            thrProductsAdddiEntity.setProductsType(1);
+
+                        }
+
+                    }
                     thrProductsAddDiService.insertThrProducts(thrProductsAdddiEntity);
                 });
             }
@@ -290,16 +296,16 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
     }
 
 
-    public String getInternalMaterialCode(String index1,String index2) {
-        String prefix = index1+index2;
+    public String getInternalMaterialCode(String index1, String index2) {
+        String prefix = index1 + index2;
         String addDiCode = thrProductsAddDiDao.getInternalMaterialCode(prefix);
-        if (StrUtil.isEmpty(addDiCode) ){
+        if (StrUtil.isEmpty(addDiCode)) {
             int incrementedNumber = 1;
-            return prefix+String.format("%09d", incrementedNumber);
-        }else{
+            return prefix + String.format("%09d", incrementedNumber);
+        } else {
             // 去除前缀并转换为数字加1
             int incrementedNumber = incrementNumberAfterPrefix(addDiCode, prefix);
-            return prefix+String.format("%09d", incrementedNumber);
+            return prefix + String.format("%09d", incrementedNumber);
         }
     }