商品编辑bug修改，出库去掉序列号校验

src/main/java/com/jsh/erp/service/impl/DepotItemServiceImpl.java

@@ -612,10 +612,11 @@ public class DepotItemServiceImpl extends ServiceImpl<DepotItemMapper, DepotItem
                                             ||BusinessConstants.SUB_TYPE_SALES.equals(depotHead.getSubType())
                                             ||BusinessConstants.SUB_TYPE_SALES_RETURN.equals(depotHead.getSubType()))) {
                                 //跳过
-                            } else {
-                                throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_EMPTY_CODE,
-                                        String.format(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_EMPTY_MSG, barCode));
                             }
+//                            else {
+//                                throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_EMPTY_CODE,
+//                                        String.format(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_EMPTY_MSG, barCode));
+//                            }
                         }
                     }
                 }

src/main/java/com/jsh/erp/service/impl/MaterialExtendServiceImpl.java

@@ -315,9 +315,9 @@ public class MaterialExtendServiceImpl extends ServiceImpl<MaterialExtendMapper,
         //修改拓展行
         if (!updatedList.isEmpty()) {
             for (MaterialExtend materialExtend : updatedList) {
-                //EXCEL中有条码在系统中已存在
+                //新条码和原来条码不一致，判断新条码是否已存在
                 MaterialExtend me = getInfoByBarCode(materialExtend.getBarCode());
-                if (me != null && !me.getBarCode().isEmpty()) {
+                if (me != null && !materialExtend.getId().equals(me.getId())) {
                     throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_PROPERTY_BARCODE_EXIST_CODE,
                             String.format(ExceptionConstants.MATERIAL_PROPERTY_BARCODE_EXIST_MSG, materialExtend.getBarCode()));
                 }

src/main/java/com/jsh/erp/service/impl/MaterialServiceImpl.java

@@ -284,7 +284,11 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
             logService.insertLog("商品",
                     new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(material.getName()).toString(), request);
             return 1;
-        }catch(Exception e){
+        }
+        catch (BusinessRunTimeException ex) {
+            throw new BusinessRunTimeException(ex.getCode(), ex.getMessage());
+        }
+        catch(Exception e){
             JshException.writeFail(logger, e);
             return 0;
         }