Merge branch 'master' of http://git.ds-bay.com/project/eccs

build.gradle

@@ -158,7 +158,7 @@ subprojects {
 
 
 configure(subprojects.findAll{
-    it.name == 'cadmin-admin'
+    it.name == 'eccs-admin'
 }){
     apply plugin: "org.springframework.boot"
     apply plugin: 'io.spring.dependency-management'

eccs-admin/src/main/resources/application-dev.yml

@@ -33,16 +33,16 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://localhost:3306/cadmin-mybatis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://localhost:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: root
+        password: 123456
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
         enabled: false
-        url: jdbc:mysql://localhost:3306/cadmin-mybatis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://localhost:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: root
+        password: 123456
       # 初始连接数
       initialSize: 5
       # 最小连接池数量

eccs-admin/src/main/resources/application-prod.yml

@@ -8,13 +8,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 127.0.0.1
+    host: 120.78.152.8
     # 端口，默认为6379
-    port: 6379
+    port: 7379
     # 数据库索引
     database: 0
     # 密码
-    password:
+    password: Abc-123#*.-
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -33,16 +33,16 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://localhost:3306/cadmin-mybatis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: root
-        password: 123456
+        url: jdbc:mysql://120.76.84.45:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: tuser
+        password: Qq!123
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
         enabled: false
-        url: jdbc:mysql://localhost:3306/cadmin-mybatis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: root
-        password: 123456
+        url: jdbc:mysql://120.76.84.45:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: tuser
+        password: Qq!123
       # 初始连接数
       initialSize: 5
       # 最小连接池数量
@@ -104,3 +104,5 @@ logging:
   level:
     com.emato: info
     org.springframework: warn
+  file:
+    path: /data/eccs/logs

eccs-admin/src/main/resources/application-test.yml

@@ -8,19 +8,19 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 127.0.0.1
+    host: 120.78.152.8
     # 端口，默认为6379
-    port: 6379
+    port: 7379
     # 数据库索引
     database: 0
     # 密码
-    password:
+    password: Abc-123#*.-
     # 连接超时时间
     timeout: 10s
     lettuce:
       pool:
         # 连接池中的最小空闲连接
-        min-idle: 0
+        min-idle: 5
         # 连接池中的最大空闲连接
         max-idle: 8
         # 连接池的最大数据库连接数
@@ -33,16 +33,16 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://localhost:3306/cadmin-mybatis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: root
-        password: 123456
+        url: jdbc:mysql://120.76.84.45:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: tuser
+        password: Qq!123
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
         enabled: false
-        url: jdbc:mysql://localhost:3306/cadmin-mybatis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: root
-        password: 123456
+        url: jdbc:mysql://120.76.84.45:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: tuser
+        password: Qq!123
       # 初始连接数
       initialSize: 5
       # 最小连接池数量
@@ -97,10 +97,12 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  pathMapping: /dev-api
+  pathMapping: /test-api
 
 # 日志配置
 logging:
   level:
     com.emato: debug
     org.springframework: info
+  file:
+    path: /data/eccs/logs

eccs-admin/src/main/resources/application.yml

@@ -37,7 +37,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles: 
-    active: dev
+    active: test
   # 文件上传
   servlet:
      multipart:

eccs-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/cadmin/logs" />
+	<property name="log.path" value="/data/eccs/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

eccs-biz/src/main/java/com/emato/biz/controller/mall/MallInveMngController.java

@@ -110,6 +110,7 @@ public class MallInveMngController extends BaseController
     {
 
 
+//        return toAjax(1);
         return toAjax(mallInveMngService.pullKmallInveMng());
     }
 

eccs-biz/src/main/java/com/emato/biz/service/impl/MallInveMngServiceImpl.java

@@ -108,6 +108,8 @@ public class MallInveMngServiceImpl implements IMallInveMngService
     @Transactional
     public int pullKmallInveMng() {
 
+
+
         Integer page = 0;
         Integer pageSize = 1000;
         int resultCode = pullMallInveMng(page, pageSize);
@@ -116,7 +118,7 @@ public class MallInveMngServiceImpl implements IMallInveMngService
             resultCode = pullMallInveMng(page, pageSize);
         }
 
-        return resultCode;
+        return resultCode==0?1:resultCode;
     }
 
     private int pullMallInveMng(Integer page, Integer pageSize) {

eccs-biz/src/main/java/com/emato/biz/service/impl/MallShopInveMngServiceImpl.java

@@ -117,7 +117,7 @@ public class MallShopInveMngServiceImpl implements IMallShopInveMngService
             resultCode = pullKmallStoreInveMng(page, pageSize);
         }
 
-        return resultCode;
+        return resultCode==0?1:resultCode;
     }
 
     private int pullKmallStoreInveMng(Integer page, Integer pageSize) {

eccs-biz/src/main/java/com/emato/biz/service/impl/OWareAdjustmentOrderServiceImpl.java

@@ -122,7 +122,7 @@ public class OWareAdjustmentOrderServiceImpl implements IOWareAdjustmentOrderSer
             page = page + 1;
             resultCode = pullAdjustmentOrder(merchSn, page, querySize);
         }
-        return resultCode;
+        return resultCode==0?1:resultCode;
     }
 
     private int pullAdjustmentOrder(String merchSn, int page, Integer querySize) {
@@ -214,7 +214,7 @@ public class OWareAdjustmentOrderServiceImpl implements IOWareAdjustmentOrderSer
             }
         }
 
-        return resultCode;
+        return resultCode==0?1:resultCode;
 
     }
 

eccs-biz/src/main/java/com/emato/biz/service/impl/OWbInveMngServiceImpl.java

@@ -125,7 +125,7 @@ public class OWbInveMngServiceImpl implements IOWbInveMngService
             page = page + 1;
             resultCode = pullInveMngFromOms(merchSn, page, querySize);
         }
-        return resultCode;
+        return resultCode==0?1:resultCode;
     }
 
     private int pullInveMngFromOms(String merchSn, int page, Integer querySize) {

eccs-biz/src/main/java/com/emato/biz/service/impl/OWbInveReceiptGoodsServiceImpl.java

@@ -121,7 +121,7 @@ public class OWbInveReceiptGoodsServiceImpl implements IOWbInveReceiptGoodsServi
             page = page + 1;
             resultCode = pullReceiptGoods(merchSn, page, querySize);
         }
-        return resultCode;
+        return resultCode==0?1:resultCode;
     }
 
     private int pullReceiptGoods(String merchSn, int page, Integer querySize) {

eccs-biz/src/main/java/com/emato/biz/service/impl/OWbMerchShopInServiceImpl.java

@@ -119,7 +119,7 @@ public class OWbMerchShopInServiceImpl implements IOWbMerchShopInService
             page = page + 1;
             resultCode = pullShopInRecord(merchSn, page, querySize);
         }
-        return resultCode;
+        return resultCode==0?1:resultCode;
     }
 
     private int pullShopInRecord(String merchSn, int page, Integer querySize) {

eccs-biz/src/main/java/com/emato/biz/service/impl/OWbMerchShopInveServiceImpl.java

@@ -118,7 +118,7 @@ public class OWbMerchShopInveServiceImpl implements IOWbMerchShopInveService
             page = page + 1;
             resultCode = pullStoreInveMngFromOms(merchSn, page, querySize);
         }
-        return resultCode;
+        return resultCode==0?1:resultCode;
     }
 
     private int pullStoreInveMngFromOms(String merchSn, int page, Integer querySize) {

eccs-biz/src/main/java/com/emato/biz/service/impl/OWbMerchShopMoveRecordServiceImpl.java

@@ -121,7 +121,7 @@ public class OWbMerchShopMoveRecordServiceImpl implements IOWbMerchShopMoveRecor
             page = page + 1;
             resultCode = pullShopInRecord(merchSn, page, querySize);
         }
-        return resultCode;
+        return resultCode==0?1:resultCode;
     }
 
     private int pullShopInRecord(String merchSn, int page, Integer querySize) {

eccs-biz/src/main/java/com/emato/biz/service/impl/OWbMerchShopOutServiceImpl.java

@@ -120,7 +120,7 @@ public class OWbMerchShopOutServiceImpl implements IOWbMerchShopOutService
             page = page + 1;
             resultCode = pullShopOutRecord(merchSn, page, querySize);
         }
-        return resultCode;
+        return resultCode==0?1:resultCode;
     }
 
     private int pullShopOutRecord(String merchSn, int page, Integer querySize) {

eccs-biz/src/main/resources/kmall-config.yml

@@ -1,8 +1,22 @@
 kmall:
+    # 开发环境地址
+#  # 查询所有库存接口
+#  queryAllInveMngUrl: http://127.0.0.1:8080/ktoeccs/queryAllGoodsInfo
+#  # 查询门店库存接口
+#  queryAllShopInveMngUrl: http://127.0.0.1:8080/ktoeccs/queryAllStoreProductInfo
+#  # 发送请求
+#  requestToKmall: http://127.0.0.1:8080/ktoeccs/sendToEccs
+  # 测试环境地址
   # 查询所有库存接口
-  queryAllInveMngUrl: http://127.0.0.1:8080/ktoeccs/queryAllGoodsInfo
+  queryAllInveMngUrl: http://183.62.225.124:8080/ktoeccs/queryAllGoodsInfo
   # 查询门店库存接口
-  queryAllShopInveMngUrl: http://127.0.0.1:8080/ktoeccs/queryAllStoreProductInfo
+  queryAllShopInveMngUrl: http://183.62.225.124:8080/ktoeccs/queryAllStoreProductInfo
   # 发送请求
-  requestToKmall: http://127.0.0.1:8080/ktoeccs/sendToEccs
+  requestToKmall: http://183.62.225.124:8080/ktoeccs/sendToEccs
+#   生产环境地址
+#  queryAllInveMngUrl: http://8.135.102.238:8080/ktoeccs/queryAllGoodsInfo
+#  # 查询门店库存接口
+#  queryAllShopInveMngUrl: http://8.135.102.238:8080/ktoeccs/queryAllStoreProductInfo
+#  # 发送请求
+#  requestToKmall: http://8.135.102.238:8080/ktoeccs/sendToEccs
 

eccs-biz/src/main/resources/oms-config.yml

@@ -11,30 +11,83 @@ oms:
   thirdSn: CW001
   # 生产环境密钥
   md5Salt: IxyIvP0sJqlUZinx
+#  # 查询商户信息接口
+#  queryMerchantInfoUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryMerchantInfoUrl
+#  # 查询第三方商户信息接口
+#  queryThirdMerchantInfoUrl:
+#  # 查询库存接口
+#  queryMngInveUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryInveMng
+#  # 查询门店库存接口
+#  queryShopMngInveUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopInveMng
+#  # 查询入库单接口
+#  queryInveReceiptUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryInveReceiptGoods
+#  # 查询入库单明细接口
+#  queryInveReceiptDetailUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryInveReceiptGoods
+#  # 查询结转接口
+#  queryAdjustmentUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryAdjustmentRecord
+#  # 查询结转明细接口
+#  queryAdjustmentDetailUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryAdjustmentDetail
+#  # 查询出区接口
+#  queryInveShipmentUrl:
+#  # 查询出区明细接口
+#  queryInveShipmentDetailUrl:
+#  # 查询门店进货接口
+#  queryShopInUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopIn
+#  # 查询门店出场接口
+#  queryShopOutUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopOut
+#  # 查询门店转移接口
+#  queryShopMoveUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopMove
+  # 测试环境
   # 查询商户信息接口
-  queryMerchantInfoUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryMerchantInfoUrl
+  queryMerchantInfoUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryMerchantInfoUrl
   # 查询第三方商户信息接口
   queryThirdMerchantInfoUrl:
   # 查询库存接口
-  queryMngInveUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryInveMng
+  queryMngInveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveMng
   # 查询门店库存接口
-  queryShopMngInveUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopInveMng
+  queryShopMngInveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopInveMng
   # 查询入库单接口
-  queryInveReceiptUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryInveReceiptGoods
+  queryInveReceiptUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveReceiptGoods
   # 查询入库单明细接口
-  queryInveReceiptDetailUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryInveReceiptGoods
+  queryInveReceiptDetailUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveReceiptGoods
   # 查询结转接口
-  queryAdjustmentUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryAdjustmentRecord
+  queryAdjustmentUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryAdjustmentRecord
   # 查询结转明细接口
-  queryAdjustmentDetailUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryAdjustmentDetail
+  queryAdjustmentDetailUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryAdjustmentDetail
   # 查询出区接口
   queryInveShipmentUrl:
   # 查询出区明细接口
   queryInveShipmentDetailUrl:
   # 查询门店进货接口
-  queryShopInUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopIn
+  queryShopInUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopIn
   # 查询门店出场接口
-  queryShopOutUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopOut
+  queryShopOutUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopOut
   # 查询门店转移接口
-  queryShopMoveUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopMove
-
+  queryShopMoveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopMove
+  # 生产环境 ws.ds-bay.com
+#  # 查询商户信息接口
+#  queryMerchantInfoUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryMerchantInfoUrl
+#  # 查询第三方商户信息接口
+#  queryThirdMerchantInfoUrl:
+#  # 查询库存接口
+#  queryMngInveUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryInveMng
+#  # 查询门店库存接口
+#  queryShopMngInveUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryShopInveMng
+#  # 查询入库单接口
+#  queryInveReceiptUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryInveReceiptGoods
+#  # 查询入库单明细接口
+#  queryInveReceiptDetailUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryInveReceiptGoods
+#  # 查询结转接口
+#  queryAdjustmentUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryAdjustmentRecord
+#  # 查询结转明细接口
+#  queryAdjustmentDetailUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryAdjustmentDetail
+#  # 查询出区接口
+#  queryInveShipmentUrl:
+#  # 查询出区明细接口
+#  queryInveShipmentDetailUrl:
+#  # 查询门店进货接口
+#  queryShopInUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryShopIn
+#  # 查询门店出场接口
+#  queryShopOutUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryShopOut
+#  # 查询门店转移接口
+#  queryShopMoveUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryShopMove

eccs-common/src/main/java/com/emato/common/core/domain/entity/SysUser.java

@@ -33,11 +33,11 @@ public class SysUser extends BaseEntity
     private Long deptId;
 
     /** 用户账号 */
-    @Excel(name = "登录名称")
+    @Excel(name = "用户名称")
     private String userName;
 
     /** 用户昵称 */
-    @Excel(name = "用户名称")
+    @Excel(name = "用户昵称")
     private String nickName;
 
     /** 用户邮箱 */

eccs-ui/.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # ECCS/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = '/eccs/dev-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

eccs-ui/.env.production

@@ -2,4 +2,4 @@
 ENV = 'production'
 
 # ECCS/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/eccs/prod-api'

eccs-ui/.env.staging

@@ -4,4 +4,4 @@ NODE_ENV = production
 ENV = 'staging'
 
 # ECCS/测试环境
-VUE_APP_BASE_API = '/stage-api'
+VUE_APP_BASE_API = '/eccs/stage-api'

eccs-ui/src/api/mall/mallinvemng.js

@@ -53,10 +53,17 @@ export function exportMallinvemng(query) {
 }
 
 // 拉取kmall的所有商品数据
-export function pullKmallInvemng(query) {
+export function pullKmallInvemng(query,loading,_this) {
   return request({
     url: '/biz/mallinvemng/pullKmallInveMng',
     method: 'POST',
-    params: query
+    params: query,
+    timeout: 3600 * 1000
+  }).then(function (response) {
+    loading.close();
+    _this.$alert("拉取成功...");
+  }).catch(function () {
+    loading.close();
+    _this.$alert("拉取异常...");
   })
 }

eccs-ui/src/api/mall/mallshopmng.js

@@ -54,10 +54,17 @@ export function exportMallshopmng(query) {
 
 pullKmallStoreInvemng
 // 拉取kmall的所有商品数据
-export function pullKmallStoreInvemng(query) {
+export function pullKmallStoreInvemng(query,loading,_this) {
   return request({
     url: '/biz/mallshopmng/pullKmallStoreInveMng',
     method: 'POST',
-    params: query
+    params: query,
+    timeout: 3600 * 1000
+  }).then(function (response) {
+    loading.close();
+    _this.$alert("拉取成功...");
+  }).catch(function () {
+    loading.close();
+    _this.$alert("拉取异常...");
   })
 }

eccs-ui/src/api/warehouse/adjustmentorder.js

@@ -53,18 +53,32 @@ export function exportAdjustmentorder(query) {
 }
 
 // 拉取结转记录
-export function pullAdjustmentorder(query) {
+export function pullAdjustmentorder(query,loading,_this) {
   return request({
     url: '/biz/adjustmentorder/pullAdjustmentOrder',
     method: 'post',
-    params: query
+    params: query,
+    timeout: 3600 * 1000
+  }).then(function (response) {
+    loading.close();
+    _this.$alert("拉取成功...");
+  }).catch(function () {
+    loading.close();
+    _this.$alert("拉取异常...");
   })
 }
 
 // 拉取结转明细
-export function pullAdjustmentorderDetail(adjustmentOrderSn) {
+export function pullAdjustmentorderDetail(adjustmentOrderSn,loading,_this) {
   return request({
     url: '/biz/adjustmentorder/pullAdjustmentorderDetail/' + adjustmentOrderSn,
-    method: 'post'
+    method: 'post',
+    timeout: 3600 * 1000
+  }).then(function (response) {
+    loading.close();
+    _this.$alert("拉取成功...");
+  }).catch(function () {
+    loading.close();
+    _this.$alert("拉取异常...");
   })
 }

eccs-ui/src/api/warehouse/invemng.js

@@ -53,10 +53,17 @@ export function exportInvemng(query) {
 }
 
 // 导出库存管理，wms入库回传时，增加库存数
-export function pullInvemng(query) {
+export function pullInvemng(query,loading,_this) {
   return request({
     url: '/biz/invemng/pullInveMng',
     method: 'post',
-    params: query
+    params: query,
+    timeout: 3600 * 1000
+  }).then(function (response) {
+    loading.close();
+    _this.$alert("拉取成功...");
+  }).catch(function () {
+    loading.close();
+    _this.$alert("拉取异常...");
   })
 }

eccs-ui/src/api/warehouse/invereceiptgoods.js

@@ -53,10 +53,17 @@ export function exportInvereceiptgoods(query) {
 }
 
 // 导出库存管理，wms入库回传时，增加库存数
-export function pullInveReceiptGoods(query) {
+export function pullInveReceiptGoods(query,loading,_this) {
   return request({
     url: '/biz/invereceiptgoods/pullReceiptGoods',
     method: 'post',
-    params: query
+    params: query,
+    timeout: 3600 * 1000
+  }).then(function (response) {
+    loading.close();
+    _this.$alert("拉取成功...");
+  }).catch(function () {
+    loading.close();
+    _this.$alert("拉取异常...");
   })
 }

eccs-ui/src/api/warehouse/shopin.js

@@ -53,10 +53,18 @@ export function exportShopin(query) {
 }
 
 // 拉取门店进货记录
-export function pullShopInRecord(query) {
+export function pullShopInRecord(query,loading,_this) {
   return request({
     url: '/biz/shopin/pullShopInRecord',
     method: 'post',
-    params: query
+    params: query,
+    timeout: 3600 * 1000
+  }).then(function (response) {
+    loading.close();
+    _this.$alert("拉取成功...");
+  }).catch(function () {
+    loading.close();
+    _this.$alert("拉取异常...");
   })
+
 }

eccs-ui/src/api/warehouse/shopinve.js

@@ -53,10 +53,17 @@ export function exportShopinve(query) {
 }
 
 // 拉取库存
-export function pullStoreInvemng(query) {
+export function pullStoreInvemng(query,loading,_this) {
   return request({
     url: '/biz/shopinve/pullStoreInveMng',
     method: 'post',
-    params: query
+    params: query,
+    timeout: 3600 * 1000
+  }).then(function (response) {
+    loading.close();
+    _this.$alert("拉取成功...");
+  }).catch(function () {
+    loading.close();
+    _this.$alert("拉取异常...");
   })
 }

eccs-ui/src/api/warehouse/shopmoverecord.js

@@ -53,10 +53,18 @@ export function exportShopmoverecord(query) {
 }
 
 // 拉取门店转移记录
-export function pullShopMoveRecord(query) {
+export function pullShopMoveRecord(query,loading,_this) {
   return request({
     url: '/biz/shopmoverecord/pullShopMoveRecord',
     method: 'post',
-    params: query
+    params: query,
+    timeout: 3600 * 1000
+  }).then(function (response) {
+    loading.close();
+    _this.$alert("拉取成功...");
+  }).catch(function () {
+    loading.close();
+    _this.$alert("拉取异常...");
+
   })
 }

eccs-ui/src/api/warehouse/shopout.js

@@ -52,10 +52,18 @@ export function exportShopout(query) {
   })
 }
 // 拉取门店出场记录
-export function pullShopOutRecord(query) {
+export function pullShopOutRecord(query,loading,_this) {
   return request({
     url: '/biz/shopout/pullShopOutRecord',
     method: 'post',
-    params: query
+    params: query,
+    timeout: 3600 * 1000
+  }).then(function (response) {
+    loading.close();
+    _this.$alert("拉取成功...");
+  }).catch(function () {
+    loading.close();
+    _this.$alert("拉取异常...");
   })
+
 }

eccs-ui/src/utils/request.js

@@ -10,7 +10,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 36000 * 1000
 })
 // request拦截器
 service.interceptors.request.use(config => {

eccs-ui/src/views/login.vue

@@ -65,8 +65,8 @@ export default {
       codeUrl: "",
       cookiePassword: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""

eccs-ui/src/views/mall/mallinvemng/index.vue

@@ -410,13 +410,24 @@ export default {
     /** 拉取按钮操作 */
     handlePull() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认拉取保税仓所有库存?', "警告", {
+
+      const _this=this
+      // 添加遮罩
+      this.$confirm('是否确认拉取电商所有库存?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
-        return pullKmallInvemng(queryParams);
+      }).then(()=> {
+        const loading = _this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        return pullKmallInvemng(queryParams,loading,_this);
+
       })
+
     }
   }
 };

eccs-ui/src/views/mall/mallshopinvemng/index.vue

@@ -454,12 +454,21 @@ export default {
     /** 拉取按钮操作 */
     handlePull() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认拉取保税仓所有库存?', "警告", {
+      const _this=this
+      // 添加遮罩
+
+      this.$confirm('是否确认拉取电商门店所有库存?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        return pullKmallStoreInvemng(queryParams);
+        const loading = _this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        return pullKmallStoreInvemng(queryParams,loading,_this);
       })
     }
   }

eccs-ui/src/views/system/role/index.vue

@@ -592,4 +592,4 @@ export default {
     }
   }
 };
-</script>
+</script>

eccs-ui/src/views/system/user/index.vue

@@ -424,6 +424,9 @@ export default {
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" }
         ],
+        deptId: [
+          { required: true, message: "请选择部门", trigger: "blur" }
+        ],
         email: [
           {
             type: "email",
@@ -657,4 +660,4 @@ export default {
     }
   }
 };
-</script>
+</script>

eccs-ui/src/views/warehouse/adjustmentorder/index.vue

@@ -89,6 +89,7 @@
           type="warning"
           icon="el-icon-download"
           size="mini"
+          :disabled="single"
           @click="handlePullDetail"
           v-hasPermi="['biz:adjustmentorder:pulldetail']"
         >拉取结转明细</el-button>
@@ -385,23 +386,40 @@ export default {
     /** 拉取记录按钮操作 */
     handlePull() {
       const queryParams = this.queryParams;
+      // 添加遮罩
+      const _this=this
       this.$confirm('是否确认导出所有库存内调结转出入库记录数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        return pullAdjustmentorder(queryParams);
+        const loading = _this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        return pullAdjustmentorder(queryParams,loading,_this);
       })
     },
     /** 拉取明细按钮操作 */
     handlePullDetail(row) {
       const adjustmentOrderSns = row.adjustmentOrderSn || this.ids;
+
+      // 添加遮罩
+      const _this=this
       this.$confirm('是否确认导出所有库存内调结转出入库记录数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        return pullAdjustmentorderDetail(adjustmentOrderSns);
+        const loading = _this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        return pullAdjustmentorderDetail(adjustmentOrderSns,loading,_this);
       })
     }
   }

eccs-ui/src/views/warehouse/invemng/index.vue

@@ -466,12 +466,20 @@ export default {
     /** 拉取按钮操作 */
     handlePull() {
       const queryParams = this.queryParams;
+      // 添加遮罩
+      const _this=this
       this.$confirm('是否确认拉取保税仓所有库存?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        return pullInvemng(queryParams);
+        const loading = _this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        return pullInvemng(queryParams,loading,_this);
       })
     }
   }

eccs-ui/src/views/warehouse/invereceiptgoods/index.vue

@@ -366,12 +366,20 @@ export default {
     /** 拉取按钮操作 */
     handlePull() {
       const queryParams = this.queryParams;
+      // 添加遮罩
+      const _this=this
       this.$confirm('是否确认拉取保税仓所有库存?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        return pullInveReceiptGoods(queryParams);
+        const loading = _this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        return pullInveReceiptGoods(queryParams,loading,_this);
       })
     }
   }

eccs-ui/src/views/warehouse/shopin/index.vue

@@ -422,12 +422,20 @@ export default {
     /** 拉取按钮操作 */
     handlePull() {
       const queryParams = this.queryParams;
+      // 添加遮罩
+      const _this=this
       this.$confirm('是否确认拉取保税仓所有库存?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        return pullShopInRecord(queryParams);
+        const loading = _this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        return pullShopInRecord(queryParams,loading,_this);
       })
     }
   }

eccs-ui/src/views/warehouse/shopinve/index.vue

@@ -508,12 +508,20 @@ export default {
     /** 拉取按钮操作 */
     handlePull() {
       const queryParams = this.queryParams;
+      // 添加遮罩
+      const _this=this
       this.$confirm('是否确认拉取保税仓所有库存?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        return pullStoreInvemng(queryParams);
+        const loading = _this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        return pullStoreInvemng(queryParams,loading,_this);
       })
     }
   }

eccs-ui/src/views/warehouse/shopmoverecord/index.vue

@@ -419,12 +419,20 @@ export default {
     /** 拉取按钮操作 */
     handlePull() {
       const queryParams = this.queryParams;
+      // 添加遮罩
+      const _this=this
       this.$confirm('是否确认拉取保税仓所有库存?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        return pullShopMoveRecord(queryParams);
+        const loading = _this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        return pullShopMoveRecord(queryParams,loading,_this);
       })
     }
   }

eccs-ui/src/views/warehouse/shopout/index.vue

@@ -408,12 +408,20 @@ export default {
     /** 拉取按钮操作 */
     handlePull() {
       const queryParams = this.queryParams;
+      // 添加遮罩
+      const _this=this
       this.$confirm('是否确认拉取门店出场记录?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        return pullShopOutRecord(queryParams);
+        const loading = _this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        return pullShopOutRecord(queryParams,loading,_this);
       })
     }
   }