فهرست منبع

去除失败的依赖包,

阿伏兔 4 سال پیش
والد
کامیت
5b3c22e227

+ 4 - 1
ruoyi-admin/src/main/resources/application.yml

@@ -8,8 +8,11 @@ ruoyi:
   copyrightYear: 2020
   # 实例演示开关
   demoEnabled: true
-  # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
+    # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
+    # 本地文件上传路径
   profile: D:/ruoyi/uploadPath
+  # 服务器文件路径
+#  profile: /usr/local/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

+ 0 - 28
ruoyi-common/src/main/java/com/ruoyi/common/utils/MyMetaObjectHandler.java

@@ -1,28 +0,0 @@
-package com.ruoyi.common.utils;
-
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.reflection.MetaObject;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-
-/**
- * 原数据处理器,处理日期自动填充问题
- */
-@Component
-@Slf4j
-public class MyMetaObjectHandler implements MetaObjectHandler {
-    @Override
-    public void insertFill(MetaObject metaObject) {
-        log.info("插入时间");
-        this.setFieldValByName("createTime", new Date(), metaObject);
-        this.setFieldValByName("updateTime", new Date(), metaObject);
-    }
-
-    @Override
-    public void updateFill(MetaObject metaObject) {
-        log.info("更新时间");
-        this.setFieldValByName("updateTime", new Date(), metaObject);
-    }
-}

+ 6 - 0
ruoyi-system/pom.xml

@@ -29,6 +29,12 @@
             <scope>compile</scope>
         </dependency>
 
+        <!-- 仓库模块-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-warehouse</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

+ 4 - 0
ruoyi-warehouse/pom.xml

@@ -39,6 +39,10 @@
             <artifactId>mybatis-plus-support</artifactId>
             <version>2.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

+ 1 - 1
ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TCorpsMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.basicData.mapper;
 
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.basicData.domain.TCorps;
 
 import java.util.List;

+ 1 - 1
ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TCustomerContactMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.basicData.mapper;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.basicData.domain.TCustomerContact;
 
 import java.util.List;

+ 1 - 2
ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TCorpsServiceImpl.java

@@ -2,7 +2,6 @@ package com.ruoyi.basicData.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.ruoyi.basicData.domain.TCorps;
 import com.ruoyi.basicData.domain.TCustomerContact;
 import com.ruoyi.basicData.mapper.TCorpsMapper;
@@ -99,7 +98,7 @@ public class TCorpsServiceImpl implements ITCorpsService {
             corps.setUpdateBy(loginUser.getUser().getUserName());
             corps.setUpdateTime(new Date());
             tCorpsMapper.updateById(corps);
-            tCustomerContactMapper.delete(new EntityWrapper<TCustomerContact>().eq("f_pid", corps.getfId()));
+//            tCustomerContactMapper.delete(new EntityWrapper<TCustomerContact>().eq("f_pid", corps.getfId()));
         }
         for (TCustomerContact cc : customerContactList) {
             cc.setfPid(fPid);

+ 0 - 4
ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TWarehouseServiceImpl.java

@@ -2,12 +2,8 @@ package com.ruoyi.basicData.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.ruoyi.basicData.domain.TCorps;
-import com.ruoyi.basicData.domain.TCustomerContact;
 import com.ruoyi.basicData.domain.TWarehouse;
 import com.ruoyi.basicData.domain.TWarehouseArea;
-import com.ruoyi.basicData.mapper.TCustomerContactMapper;
 import com.ruoyi.basicData.mapper.TWarehouseAreaMapper;
 import com.ruoyi.basicData.mapper.TWarehouseMapper;
 import com.ruoyi.basicData.service.ITWarehouseService;

+ 3 - 3
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWhgenleg.java

@@ -40,7 +40,7 @@ public class TWhgenleg extends BaseEntity {
     /**
      * 提单号
      */
-    private Long fMblno;
+    private String fMblno;
 
     /**
      * 原始入库业务编号
@@ -197,11 +197,11 @@ public class TWhgenleg extends BaseEntity {
         return fCorpid;
     }
 
-    public void setfMblno(Long fMblno) {
+    public void setfMblno(String fMblno) {
         this.fMblno = fMblno;
     }
 
-    public Long getfMblno() {
+    public String getfMblno() {
         return fMblno;
     }
 

+ 1 - 1
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TEnclosureMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.warehouseBusiness.mapper;
 
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.warehouseBusiness.domain.TEnclosure;
 
 import java.util.List;

+ 1 - 1
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsfeesMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.warehouseBusiness.mapper;
 
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfees;
 
 import java.util.List;

+ 1 - 1
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsitemsMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.warehouseBusiness.mapper;
 
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems;
 
 import java.util.List;