diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 00000000..e96534fb
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/spring/modules/base/controller/BaseController.java b/src/main/java/com/spring/modules/base/controller/BaseController.java
new file mode 100644
index 00000000..b5cf9b2e
--- /dev/null
+++ b/src/main/java/com/spring/modules/base/controller/BaseController.java
@@ -0,0 +1,173 @@
+package com.spring.modules.base.controller;
+
+import com.spring.modules.base.entity.CompanyData;
+import com.spring.modules.base.entity.*;
+import com.spring.modules.base.service.BaseService;
+import com.spring.modules.base.utils.ResponseData;
+import com.spring.modules.sys.controller.AbstractController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author rq
+ * @ClassName: BaseController
+ * @Description: 基础功能controller
+ * @date 2021年9月25日
+ */
+@Controller
+@RequestMapping(value = "/base")
+public class BaseController extends AbstractController {
+ @Autowired
+ private BaseService baseService;
+
+
+
+//----------工厂信息--------------------------
+
+ /**
+ * 获取工厂日历
+ *
+ * @param
+ * @return
+ */
+ @PostMapping(value = "/getSiteData")
+ @ResponseBody
+ public Object getSiteData(@RequestBody SiteData inData) {
+ Map map = new HashMap<>();
+ try {
+ List result = baseService.getSiteData(inData);
+ map.put("success", true);
+ map.put("rows", result);
+ map.put("total", result.size());
+ } catch (Exception e) {
+ map.put("success", false);
+ map.put("msg", e.getMessage());
+ }
+ return map;
+ }
+
+ /**
+ * 获取会计企业
+ *
+ * @param
+ * @return
+ */
+ @PostMapping(value = "/getCompanyData")
+ @ResponseBody
+ public Object getCompanyData() {
+ Map map = new HashMap<>();
+ try {
+ List result = baseService.getCompanyData();
+ map.put("success", true);
+ map.put("rows", result);
+ map.put("total", result.size());
+ } catch (Exception e) {
+ map.put("success", false);
+ map.put("msg", e.getMessage());
+ }
+ return map;
+ }
+
+ /**
+ * @return {@link Object}
+ * @Title siteSave
+ * @Description 保存工厂
+ * @author rq
+ * @date 2021/4/16 11:56
+ */
+
+ @PostMapping("/siteSave")
+ @ResponseBody
+ public Object siteSave(@RequestBody SiteData inData) {
+ ResponseData responseData = new ResponseData();
+ try {
+ responseData = baseService.siteSave(inData);
+ } catch (Exception e) {
+ responseData.setMsg(e.getMessage());
+ responseData.setCode("500");
+ }
+ return responseData;
+ }
+
+
+ //=============会计单位信息===================
+
+ /**
+ * 获取生产订单类型
+ *
+ * @param
+ * @return
+ */
+ @PostMapping(value = "/getCompanyInformation")
+ @ResponseBody
+ public Object getCompanyInformation(@RequestBody CompanyData indata) {
+ Map map = new HashMap<>();
+ try {
+ List result = baseService.getCompanyInformation(indata);
+ map.put("success", true);
+ map.put("rows", result);
+ map.put("total", result.size());
+ } catch (Exception e) {
+ map.put("success", false);
+ map.put("msg", e.getMessage());
+ }
+ return map;
+ }
+
+
+ /**
+ * @return {@link Object}
+ * @Title saveShopOrderFamily
+ * @Description 保存修改生产订单类型
+ * @author rq
+ * @date 2021/4/16 11:56
+ */
+
+ @PostMapping("/saveCompanyInformation")
+ @ResponseBody
+ public Object saveCompanyInformation(@RequestBody CompanyData inData) {
+ ResponseData responseData = new ResponseData();
+ try {
+ responseData = baseService.saveCompanyInformation(inData);
+ } catch (Exception e) {
+ responseData.setMsg(e.getMessage());
+ responseData.setCode("500");
+ }
+ return responseData;
+ }
+
+ /**
+ * @return {@link Object}
+ * @Title deleteShopOrderFamily
+ * @Description 删除生产订单类型
+ * @author rq
+ * @date 2021/4/16 11:56
+ */
+
+ @PostMapping("/deleteCompanyInformation")
+ @ResponseBody
+ public Object deleteCompanyInformation(@RequestBody CompanyData inData) {
+ ResponseData responseData = new ResponseData();
+ try {
+ responseData = baseService.deleteCompanyInformation(inData);
+ } catch (Exception e) {
+ responseData.setMsg(e.getMessage());
+ responseData.setCode("500");
+ }
+ return responseData;
+ }
+
+
+
+
+
+
+}
diff --git a/src/main/java/com/spring/modules/base/dao/BaseMapper.java b/src/main/java/com/spring/modules/base/dao/BaseMapper.java
new file mode 100644
index 00000000..ccd4e2a1
--- /dev/null
+++ b/src/main/java/com/spring/modules/base/dao/BaseMapper.java
@@ -0,0 +1,165 @@
+package com.spring.modules.base.dao;
+
+
+import com.spring.modules.base.entity.AccessSiteData;
+import com.spring.modules.base.entity.CompanyData;
+import com.spring.modules.base.entity.SiteData;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author rq
+ * @ClassName: BaseMapper
+ * @Description: 工艺的dao
+ * @date 2021年9月25日
+ */
+@Mapper
+@Repository
+public interface BaseMapper {
+
+
+ /**
+ * @param
+ * @return List
+ * @Description 获得工厂信息
+ * @Title getSiteData
+ * @author rq
+ * @date 2021/10/9 14:27
+ * @throw
+ */
+ List getSiteData(SiteData inData);
+
+ /**
+ * @param
+ * @return List
+ * @Description 获取会计企业
+ * @Title getCompanyData
+ * @author rq
+ * @date 2021/10/9 16:37
+ * @throw
+ */
+ List getCompanyData();
+
+ /**
+ * @param
+ * @return List
+ * @Description 检查工厂编码
+ * @Title checkSiteId
+ * @author rq
+ * @date 2021/10/10 16:49
+ * @throw
+ */
+ List checkSiteId(String siteID);
+
+
+ /**
+ * @param inData
+ * @return void
+ * @Description 保存工厂
+ * @Title saveSite
+ * @author rq
+ * @date 2021/10/10 16:52
+ * @throw
+ */
+ void saveSite(SiteData inData);
+
+ /**
+ * @param inData
+ * @return void
+ * @Description 修改工厂
+ * @Title editSite
+ * @author rq
+ * @date 2021/10/10 16:52
+ * @throw
+ */
+ void editSite(SiteData inData);
+
+
+
+ /**
+ * @return List
+ * @Description 检查角色工厂权限
+ * @Title checkAccessSite
+ * @author rq
+ * @date 2021/10/10 22:05
+ * @throw
+ */
+ List checkAccessSite(@Param("site") String site, @Param("userID") String userID);
+
+
+
+
+ /**
+ * @param indata
+ * @return List
+ * @Description 查询会计单位信息
+ * @Title getCompanyInformation
+ * @author rq
+ * @date 2021/10/10 22:05
+ * @throw
+ */
+ List getCompanyInformation(CompanyData indata);
+
+
+ /**
+ * @param indata
+ * @return List
+ * @Description 查询会计单位信息
+ * @Title getCompanyInformation
+ * @author rq
+ * @date 2021/10/10 22:05
+ * @throw
+ */
+ List checkCompanyInformation(CompanyData indata);
+
+ /**
+ * @param
+ * @Description 保存加工中心
+ * @Title saveProductionLineData
+ * @author rq
+ * @date 2021/10/9 16:37
+ * @throw
+ */
+ void saveCompanyInformation(CompanyData indata);
+
+ /**
+ * @param inData
+ * @return void
+ * @Description 修改加工中心
+ * @Title editProductionLineData
+ * @author rq
+ * @date 2021/10/10 16:52
+ * @throw
+ */
+ void editCompanyInformation(CompanyData inData);
+
+ /**
+ * @param inData
+ * @return void
+ * @Description 删除加工中心
+ * @Title deleteProductionLineData
+ * @author rq
+ * @date 2021/10/10 23:39
+ * @throw
+ */
+ void deleteCompanyInformation(CompanyData inData);
+
+ /**
+ * @param inData
+ * @return List
+ * @Description TODO
+ * @Title checkCompanyInSite
+ * @author rq
+ * @date 2022/1/10 17:10
+ * @throw
+ */
+ List checkCompanyInSite(CompanyData inData);
+
+
+
+
+
+}
diff --git a/src/main/java/com/spring/modules/base/entity/CompanyData.java b/src/main/java/com/spring/modules/base/entity/CompanyData.java
new file mode 100644
index 00000000..1ea26859
--- /dev/null
+++ b/src/main/java/com/spring/modules/base/entity/CompanyData.java
@@ -0,0 +1,140 @@
+package com.spring.modules.base.entity;
+
+public class CompanyData {
+ /**
+ *
+ */
+ private String companyID;
+
+ /**
+ *
+ */
+ private String companyName;
+
+ /**
+ *
+ */
+ private String active;
+
+ /**
+ *
+ */
+ private String taxNo;
+
+ /**
+ *
+ */
+ private String bankName;
+
+ /**
+ *
+ */
+ private String bankAccount;
+
+ /**
+ *
+ */
+ private String cutoffDateDb;
+
+ /**
+ *
+ */
+ private String cutoffDate;
+
+ /**
+ *
+ */
+ private Integer cutoffDateFixDate;
+
+ private Integer add;
+ private String user;
+
+ public String getCompanyID() {
+ return companyID;
+ }
+
+ public void setCompanyID(String companyID) {
+ this.companyID = companyID;
+ }
+
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+
+ public String getActive() {
+ return active;
+ }
+
+ public void setActive(String active) {
+ this.active = active;
+ }
+
+ public String getTaxNo() {
+ return taxNo;
+ }
+
+ public void setTaxNo(String taxNo) {
+ this.taxNo = taxNo;
+ }
+
+ public String getBankName() {
+ return bankName;
+ }
+
+ public void setBankName(String bankName) {
+ this.bankName = bankName;
+ }
+
+ public String getBankAccount() {
+ return bankAccount;
+ }
+
+ public void setBankAccount(String bankAccount) {
+ this.bankAccount = bankAccount;
+ }
+
+ public String getCutoffDateDb() {
+ return cutoffDateDb;
+ }
+
+ public void setCutoffDateDb(String cutoffDateDb) {
+ this.cutoffDateDb = cutoffDateDb;
+ }
+
+ public String getCutoffDate() {
+ return cutoffDate;
+ }
+
+ public void setCutoffDate(String cutoffDate) {
+ this.cutoffDate = cutoffDate;
+ }
+
+ public Integer getCutoffDateFixDate() {
+ return cutoffDateFixDate;
+ }
+
+ public void setCutoffDateFixDate(Integer cutoffDateFixDate) {
+ this.cutoffDateFixDate = cutoffDateFixDate;
+ }
+
+ public Integer getAdd() {
+ return add;
+ }
+
+ public void setAdd(Integer add) {
+ this.add = add;
+ }
+
+ public String getUser() {
+ return user;
+ }
+
+ public void setUser(String user) {
+ this.user = user;
+ }
+}
+
diff --git a/src/main/java/com/spring/modules/base/service/BaseService.java b/src/main/java/com/spring/modules/base/service/BaseService.java
new file mode 100644
index 00000000..5352c96f
--- /dev/null
+++ b/src/main/java/com/spring/modules/base/service/BaseService.java
@@ -0,0 +1,82 @@
+package com.spring.modules.base.service;
+
+import com.spring.modules.base.entity.CompanyData;
+import com.spring.modules.base.entity.*;
+import com.spring.modules.base.utils.ResponseData;
+
+import java.util.List;
+
+public interface BaseService {
+
+//----------工厂信息--------------------------
+ /**
+ * @Description 获得工厂信息
+ * @Title getSiteData
+ * @param
+ * @author rq
+ * @date 2021/10/9 14:27
+ * @return List
+ * @throw
+ */
+ List getSiteData(SiteData inData);
+ /**
+ * @Description 获取会计企业
+ * @Title getCompanyData
+ * @param
+ * @author rq
+ * @date 2021/10/9 16:37
+ * @return List
+ * @throw
+ */
+ List getCompanyData();
+
+ /**
+ * @Description 保存修改工厂
+ * @Title siteSave
+ * @param
+ * @author rq
+ * @date 2021/10/9 16:37
+ * @return List
+ * @throw
+ */
+ ResponseData siteSave(SiteData inData);
+
+
+
+ //=============会计单位信息===================
+ /**
+ * @Description 获取生产订单类型
+ * @Title getCompanyInformation
+ * @param indata
+ * @author rq
+ * @date 2021/10/10 22:05
+ * @return List
+ * @throw
+ */
+ List getCompanyInformation(CompanyData indata);
+
+ /**
+ * @Description 保存修改生产订单类型
+ * @Title saveCompanyInformation
+ * @param
+ * @author rq
+ * @date 2021/10/9 16:37
+ * @return
+ * @throw
+ */
+ ResponseData saveCompanyInformation(CompanyData inData);
+
+ /**
+ * @Description 删除生产订单类型
+ * @Title deleteCompanyInformation
+ * @param
+ * @author rq
+ * @date 2021/10/9 16:37
+ * @return
+ * @throw
+ */
+ ResponseData deleteCompanyInformation(CompanyData inData);
+
+
+
+}
diff --git a/src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java
new file mode 100644
index 00000000..02327594
--- /dev/null
+++ b/src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java
@@ -0,0 +1,133 @@
+package com.spring.modules.base.service.Impl;
+
+
+
+import com.spring.common.constant.SysMsgConstant;
+
+import com.spring.modules.base.dao.BaseMapper;
+import com.spring.modules.base.entity.CompanyData;
+import com.spring.modules.base.entity.*;
+import com.spring.modules.base.service.BaseService;
+import com.spring.modules.base.utils.ResponseData;
+
+import com.spring.modules.sys.service.SysMsgService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+import java.util.List;
+
+
+@Service
+public class BaseServiceImpl implements BaseService {
+ @Autowired
+ private BaseMapper baseMapper;
+
+
+ @Autowired
+ private SysMsgService sysMsgService;
+
+
+
+ //----------工厂信息--------------------------
+ @Override
+ public List getSiteData(SiteData inData) {
+ List result = baseMapper.getSiteData(inData);
+ return result;
+ }
+
+ @Override
+ public List getCompanyData() {
+ List result = baseMapper.getCompanyData();
+ return result;
+ }
+
+ @Override
+ public ResponseData siteSave(@RequestBody SiteData inData) {
+ ResponseData responseData = new ResponseData();
+ if (inData.getAdd() == 0) {
+ List list = baseMapper.checkSiteId(inData.getSiteID());
+ if (list.size() != 0) {
+ responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200030));
+ responseData.setCode("500");
+ return responseData;
+ }
+ //新增
+ baseMapper.saveSite(inData);
+ } else {
+ List list = baseMapper.checkSiteId(inData.getSiteID());
+ if (list.size() == 0) {
+ responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200031));
+ responseData.setCode("500");
+ return responseData;
+ }
+ baseMapper.editSite(inData);
+ }
+ responseData.setCode("200");
+ responseData.setSuccess(true);
+ responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
+ return responseData;
+ }
+
+
+
+ //=============生产订单类型===================
+ @Override
+ public List getCompanyInformation(CompanyData indata) {
+ List result = baseMapper.getCompanyInformation(indata);
+ return result;
+ }
+
+ @Override
+ public ResponseData saveCompanyInformation(CompanyData inData) {
+ ResponseData responseData = new ResponseData();
+ if (inData.getCutoffDate().equals("自然月月底")) {
+ inData.setCutoffDateDb("E");
+ inData.setCutoffDateFixDate(0);
+ }
+ if (inData.getCutoffDate().equals("不固定")) {
+ inData.setCutoffDateDb("V");
+ inData.setCutoffDateFixDate(0);
+ }
+ if (inData.getCutoffDate().equals("每月固定日")) {
+ inData.setCutoffDateDb("F");
+ }
+ if (inData.getAdd() == 0) {
+ List list2 = baseMapper.checkCompanyInformation(inData);
+ if (list2.size() != 0) {
+ responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200053));
+ responseData.setCode("500");
+ return responseData;
+ }
+ //新增
+ baseMapper.saveCompanyInformation(inData);
+ } else {
+ baseMapper.editCompanyInformation(inData);
+ }
+ responseData.setCode("200");
+ responseData.setSuccess(true);
+ responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
+ return responseData;
+ }
+
+ @Override
+ public ResponseData deleteCompanyInformation(CompanyData inData) {
+ ResponseData responseData = new ResponseData();
+ List check = baseMapper.checkCompanyInSite(inData);
+ if (check.size() > 0) {
+ responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200054));
+ responseData.setCode("500");
+ return responseData;
+ }
+ baseMapper.deleteCompanyInformation(inData);
+ responseData.setCode("200");
+ responseData.setSuccess(true);
+ responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
+ return responseData;
+ }
+
+
+}
diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml
new file mode 100644
index 00000000..1b1258a9
--- /dev/null
+++ b/src/main/resources/mapper/base/BaseMapper.xml
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ INSERT INTO Site (SiteID, SiteName, SiteName_E, Address, Address_E, ContactName, PostCode, Email, FaxNo,
+ PhoneNo, Active, Website, CompanyID, ShipTime,
+ ReferenceCustomerID)
+ VALUES (#{siteID}, #{siteName}, #{siteNameE}, #{address}, #{addressE}, #{contactName}, #{postCode}, #{email},
+ #{faxNo}, #{phoneNo}, #{active},
+ #{website}, #{companyID}, #{shipTime}, #{referenceCustomerID})
+
+
+
+ update Site
+ SET SiteName=#{siteName},
+ SiteName_E=#{siteNameE},
+ Address=#{address},
+ Address_E=#{addressE},
+ ContactName=#{contactName},
+ PostCode=#{postCode},
+ Email=#{email},
+ FaxNo=#{faxNo},
+ PhoneNo=#{phoneNo},
+ Active=#{active},
+ Website=#{website},
+ CompanyID=#{companyID},
+ ShipTime=#{shipTime},
+ ReferenceCustomerID=#{referenceCustomerID}
+ where SiteID = #{siteID}
+
+
+
+
+
+
+
+
+
+
+
+ INSERT INTO Company (CompanyID, CompanyName, Active, TaxNo, BankName, BankAccount, CutoffDate_DB, CutoffDate,
+ CutoffDate_FixDate)
+ values (#{companyID}, #{companyName}, #{active}, #{taxNo}, #{bankName}, #{bankAccount}, #{cutoffDateDb},
+ #{cutoffDate}, #{cutoffDateFixDate})
+
+
+ UPDATE Company
+ SET CompanyName=#{companyName},
+ CutoffDate_DB=#{cutoffDateDb},
+ Active=#{active},
+ TaxNo=#{taxNo},
+ BankName=#{bankName},
+ BankAccount=#{bankAccount},
+ CutoffDate=#{cutoffDate},
+ CutoffDate_FixDate=#{cutoffDateFixDate}
+ where CompanyID = #{companyID}
+
+
+ delete
+ from Company
+ where CompanyID = #{companyID}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/target/classes/com/spring/common/aop/RepeatSubmitAspect.class b/target/classes/com/spring/common/aop/RepeatSubmitAspect.class
index 65979d69..83fa667c 100644
Binary files a/target/classes/com/spring/common/aop/RepeatSubmitAspect.class and b/target/classes/com/spring/common/aop/RepeatSubmitAspect.class differ