From 39bdda9002b548e236efe7cbc9f8b15f46b6dd92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 24 May 2023 22:32:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=89=AB=E7=A0=81=EF=BC=9A?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BA=8F=E5=88=97=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E5=85=88=E6=A0=B9=E6=8D=AE=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E7=A0=81=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E6=9F=A5=E4=B8=8D=E5=88=B0=E5=B0=B1=E7=9B=B4=E6=8E=A5=E6=9F=A5?=
 =?UTF-8?q?=E6=9D=A1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/controller/MaterialController.java    |  6 ++++++
 .../jsh/erp/datasource/mappers/MaterialMapperEx.java  |  2 ++
 .../com/jsh/erp/service/material/MaterialService.java |  4 ++++
 .../main/resources/mapper_xml/MaterialMapperEx.xml    | 11 +++++++++++
 4 files changed, 23 insertions(+)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
index 8d01f939..ef81f449 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -2,6 +2,7 @@ package com.jsh.erp.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.datasource.entities.MaterialExtend;
 import com.jsh.erp.datasource.entities.MaterialVo4Unit;
 import com.jsh.erp.datasource.entities.Unit;
 import com.jsh.erp.service.depot.DepotService;
@@ -463,6 +464,11 @@ public class MaterialController {
         BaseResponseInfo res = new BaseResponseInfo();
         try {
             String[] mpArr = mpList.split(",");
+            //支持序列号查询，先根据序列号查询条码，如果查不到就直接查条码
+            MaterialExtend materialExtend = materialService.getMaterialExtendBySerialNumber(barCode);
+            if(materialExtend!=null && StringUtil.isNotEmpty(materialExtend.getBarCode())) {
+                barCode = materialExtend.getBarCode();
+            }
             List<MaterialVo4Unit> list = materialService.getMaterialByBarCode(barCode);
             if(list!=null && list.size()>0) {
                 for(MaterialVo4Unit mvo: list) {
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
index 6c9f2359..5cdd926f 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
@@ -156,4 +156,6 @@ public interface MaterialMapperEx {
             @Param("unit") String unit,
             @Param("unitId") Long unitId);
 
+    MaterialExtend getMaterialExtendBySerialNumber(
+            @Param("serialNumber") String serialNumber);
 }
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
index 352cc89d..e9468453 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
@@ -1350,4 +1350,8 @@ public class MaterialService {
         example.createCriteria().andIdIn(idList).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
         return materialMapper.updateByExampleSelective(material, example);
     }
+
+    public MaterialExtend getMaterialExtendBySerialNumber(String serialNumber) {
+        return materialMapperEx.getMaterialExtendBySerialNumber(serialNumber);
+    }
 }
diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
index 9284c606..1def0a87 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
@@ -742,4 +742,15 @@
             and m.id != #{id}
         </if>
     </select>
+
+    <select id="getMaterialExtendBySerialNumber" resultType="com.jsh.erp.datasource.entities.MaterialExtend">
+        select me.bar_code
+        from jsh_material m
+        left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_flag,'0') !='1'
+        left join jsh_serial_number sn on sn.material_id=m.id and ifnull(sn.delete_flag,'0') !='1'
+        where sn.serial_number = #{serialNumber}
+        and me.default_flag=1
+        and ifnull(m.delete_flag,'0') !='1'
+        limit 0,1
+    </select>
 </mapper>
\ No newline at end of file