From baeae530bc5dfdd23359f34b047f449c1541359f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 27 三月 2024 11:23:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java
similarity index 83%
rename from north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialService.java
rename to north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java
index 9c7b114..eb878ef 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java
@@ -1,19 +1,9 @@
package com.example.erp.service.mm;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.example.erp.entity.mm.FinishedGoodsInventory;
-import com.example.erp.entity.mm.FinishedOperateLog;
import com.example.erp.entity.mm.MaterialStore;
-import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.sd.Customer;
-import com.example.erp.entity.sd.OrderDetail;
-import com.example.erp.entity.sd.Product;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.mm.BasicWarehouseTypeMapper;
-import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper;
-import com.example.erp.mapper.mm.FinishedOperateLogMapper;
import com.example.erp.mapper.mm.MaterialStoreMapper;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,14 +11,12 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
import java.util.*;
@Service
@DS("mm")
@Transactional(rollbackFor = Exception.class)
-public class MaterialService {
+public class MaterialStoreService {
@Autowired
MaterialStoreMapper materialStoreMapper;
@Autowired
--
Gitblit v1.8.0