从源更新

src/main/java/com/jsh/erp/controller/DepotItemController.java

@@ -136,22 +136,7 @@ public class DepotItemController {
         return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
     }
 
-    /**
+
-     * 仅根据商品Id进行数量合计
-     *
-     * @param type
-     * @param mId
-     * @return
-     */
-    public int sumNumberByMaterialId(String type, Long mId)throws Exception {
-        int allNumber = 0;
-        try {
-            allNumber = depotItemService.findByTypeAndMaterialId(type, mId);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return allNumber;
-    }
 
 
     /**

src/main/java/com/jsh/erp/service/ResourceInfo.java

@@ -27,7 +27,6 @@ import java.lang.annotation.*;
  * serialNumber-105
  * organization-110
  * orgaUserRel-115
- * tenant-120
  */
 @Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)

src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java

@@ -264,12 +264,10 @@ public class DepotHeadService {
     /**
      * 创建一个唯一的序列号
      * */
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public  String buildOnlyNumber()throws Exception{
-    public String buildOnlyNumber()throws Exception{
         Long buildOnlyNumber=null;
         synchronized (this){
             try{
-                depotHeadMapperEx.updateBuildOnlyNumber(); //编号+1
                 buildOnlyNumber= depotHeadMapperEx.getBuildOnlyNumber(BusinessConstants.DEPOT_NUMBER_SEQ);
             }catch(Exception e){
                 logger.error("异常码[{}],异常提示[{}],异常[{}]",
@@ -277,6 +275,7 @@ public class DepotHeadService {
                 throw new BusinessRunTimeException(ExceptionConstants.DATA_WRITE_FAIL_CODE,
                         ExceptionConstants.DATA_WRITE_FAIL_MSG);
             }
+
         }
         if(buildOnlyNumber<BusinessConstants.SEQ_TO_STRING_MIN_LENGTH){
            StringBuffer sb=new StringBuffer(buildOnlyNumber.toString());