Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/controller/FileController.java

@@ -76,26 +76,27 @@ public class FileController {
             if ("mp4".equals(fileType) || "avi".equals(fileType) || "mov".equals(fileType)) {
                 return "video";
             }
-            // 小程序
-            if (Constant.AppCode.WEIXIN.getCode().equals(appCode)) {
+            // 网页端
+            if (Constant.AppCode.WEB.getCode().equals(appCode)) {
+
                 if ("xls".equals(fileType) || "xlsx".equals(fileType)) {
-                    return "file";
+                    return "excel";
                 }
                 if ("pdf".equals(fileType)) {
-                    return "file";
+                    return "pdf";
                 }
                 if ("jpg".equals(fileType) || "jepg".equals(fileType) || "png".equals(fileType)) {
-                    return "image";
+                    return "img";
                 }
             } else {
                 if ("xls".equals(fileType) || "xlsx".equals(fileType)) {
-                    return "excel";
+                    return "file";
                 }
                 if ("pdf".equals(fileType)) {
-                    return "pdf";
+                    return "file";
                 }
                 if ("jpg".equals(fileType) || "jepg".equals(fileType) || "png".equals(fileType)) {
-                    return "img";
+                    return "image";
                 }
             }
         }

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -596,7 +596,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                sys.f_remove_zero(t.outing_qty + t.out_qty)                                                              as outing_qty,
                t.outing_amt + t.out_amt                                                              as outing_amt,
                t.non_std_code,
-               t.remarks
+               t.remarks,
                tmgu.decimal_places    as "decimalPlaces",
                tmgus.unit_name         as "subUnitName",
                tmgu.unit_name         as "unitName" ,
@@ -654,17 +654,17 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                sys.f_remove_zero(t.out_qty) as out_qty,
                t.out_amt,
             t.non_std_code,
-               t.remarks
-                ,tmgu.decimal_places    as "decimalPlaces"
-                ,tmgus.unit_name         as "subUnitName"
-                ,tmgu.unit_name         as "unitName"
-                ,t.pack_box
-                ,tmgs.flg_sub_unit       as "flgSubUnit"
-                ,t.outing_box
-                ,t.outing_piece
-                ,t.out_box
-                ,t.out_piece
-        ,t.out_status
+               t.remarks,
+               tmgu.decimal_places    as "decimalPlaces",
+                tmgus.unit_name         as "subUnitName",
+                tmgu.unit_name         as "unitName",
+                t.pack_box,
+                tmgs.flg_sub_unit       as "flgSubUnit",
+                t.outing_box,
+                t.outing_piece,
+                t.out_box,
+                t.out_piece,
+                t.out_status
         FROM dkic_b.t_psi_outbound_item as t
                  left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = t.wh_id
                  left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = t.sku_id

src/main/java/com/dk/mdm/mapper/pur/PurchaseMapper.xml

@@ -553,7 +553,9 @@
         tmgs.sku_images AS  list_sku_images,
         sys.f_remove_zero(tpit.usable_qty) AS list_usable_qty,
         sys.f_remove_zero(tpit.inv_qty) AS list_inv_qty,
-        tpit.outing_qty AS list_outing_qty
+        tpit.outing_qty AS list_outing_qty,
+        sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "intoStatusName",
+        sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}) as "purStatusName"
     </sql>
 
     <!-- 查询表dkic_b.t_psi_purchase，（条件查询+分页）列表 -->
@@ -1015,6 +1017,8 @@
         Left join dkic_b.t_mst_staff tms on tpp.staff_id = tms.staff_id
         Left join dkic_b.t_mst_staff tms1 on tpp.make_staff = tms1.staff_id
         Left join dkic_b.t_mst_warehouse tmw on tpp.wh_id = tmw.wh_id
+        left join sys.t_data_kind tdk1 on tdk1.kind_code = tpp.into_status
+        left join sys.t_data_kind tdk2 on tdk2.kind_code = tpp.pur_status
         <include refid="Condition_1"/>
         ORDER BY  tpp.make_time
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">

src/main/java/com/dk/mdm/model/response/pur/PurchaseItemResponse.java

@@ -54,6 +54,21 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @ApiModelProperty(value = "片")
     private  BigDecimal piece;
 
+    /**
+     * 仓库
+     */
+    @Excel(name = "仓库")
+    @ApiModelProperty(value = "仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String whId;
+
+    /**
+     * 收货仓库
+     */
+    @ApiModelProperty(value = "收货仓库")
+    private String whName;
+
+
     @ApiModelProperty(value = "基本单位")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String unitId;

src/main/java/com/dk/mdm/service/mst/CustomerService.java

@@ -152,7 +152,7 @@ public class CustomerService extends BaseService<Customer> {
         //报备日期
         customer.setReportTime(LocalDateTime.now());
         // 如果有初始欠款，那么就是成交状态
-        if(customerVO.getStartAmount().compareTo(BigDecimal.ZERO) != 0){
+        if(customerVO != null && customerVO.getStartAmount() != null && customerVO.getStartAmount().compareTo(BigDecimal.ZERO) != 0){
             customer.setSaleStatus(Constant.SaleStatus.CHENGJIAO.getName());
         }
         ResponseResultVO<?> insert = super.insert(customer);

src/main/java/com/dk/mdm/service/pur/PurchaseService.java

@@ -326,6 +326,8 @@ public class PurchaseService extends BaseService<Purchase> {
         List<PurchaseItemResponse> purchaseItemResponses = purchaseItemMapper.selectByCond(new PurchaseItemQuery().setPurId(purId));
         for (PurchaseItemResponse item : purchaseItemResponses) {
             item.setPurNo(purchaseResponse.getPurNo());
+            item.setWhId(purchaseResponse.getWhId());
+            item.setWhName(purchaseResponse.getWhName());
         }
         purchaseResponse.setPurchaseItemResponseList(purchaseItemResponses);
         return ResponseResultUtil.success(purchaseResponse);

src/main/resources/prod/bootstrap.yml

@@ -1,20 +1,196 @@
 server:
-  port: 6003
+  port: 7008
 spring:
   application:
-    name: mdm-server
+    name: mdm-server-dkic-b1
+  profiles:
+    active: @environment@
   cloud:
     nacos:
       config:
-        file-extension: yaml
-        server-addr: ${NACOS_HOST:mse-ab4cb036-nacos-ans.mse.aliyuncs.com:8848}
-        namespace: ${NACOS_SPACE:hgscrm-prod}
-        shared-configs:
-          - data-id: common.yaml
-            group: DEFAULT_GROUP
-        group: ${group-id:DEFAULT_GROUP}
+        server-addr: 124.71.44.215:8848
       discovery:
-        server-addr: ${NACOS_HOST:mse-ab4cb036-nacos-ans.mse.aliyuncs.com:8848}
-        namespace: ${NACOS_SPACE:hgscrm-prod}
+        server-addr: 124.71.44.215:8848
+        ip: 124.71.44.215 #默认是局域网ip，固定为外网ip
+        namespace: dkic
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://dkdev.dkiboss.com:15000/dkic_dev_b1
+    username: dkic_sp
+    password: dk
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      initial-size: 10 # 初始化时建立物理连接的个数。初始化发生在显示调用init方法，或者第一次getConnection时
+      max-active: 150 # 最大连接池连接数量，最大活跃连接数
+      min-idle: 10 # 最小连接池连接数量，最小空闲数量
+      max-wait: 300000   # 获取连接时最大等待时间，单位毫秒
+      # 是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
+      pool-prepared-statements: false
+      # 指定每个连接上PSCache的大小
+      # max-pool-prepared-statement-per-connection-size: 20
+      # 和上面的等价
+      # max-open-prepared-statements:
+      # 指定检测连接sql，如果是null，会影响testWhileIdle、testOnBorrow、testOnReturn失效，如果底层代码use-ping-method是true，默认使用ping
+      validation-query: SELECT 1
+      validation-query-timeout: 500
+      # 申请连接时会使用validationQuery检测连接是否有效，true会降低性能，如果是true，并且检测到连接已关闭，会获取其它的可用的连接
+      test-on-borrow: false
+      # 归还连接时会使用validationQuery检测连接是否有效，true会降低性能，如果是true，并且检测到连接已关闭，会获取其它的可用的连接，放回数据库线程池
+      test-on-return: false
+      # 建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果此连接空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
+      test-while-idle: true
+      # 1)配合testWhileIdle=true时使用，如果当前jdbc使用间隔大于timeBetweenEvictionRunsMillis配置的空闲连接过期时间，执行validationQuery检测连接是否有效。
+      # 数据库会主动超时并断开连接，因此建议timeBetweenEvictionRunsMillis小于数据库的连接主动断开时间（如mysql的wait_timeout和interactive_timeout）
+      # 2)配置间隔多久才进行一次检测，Destroy线程检测需要关闭的空闲连接的时间，单位是毫秒
+      time-between-eviction-runs-millis: 55000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      min-evictable-idle-time-millis: 30000
+      # max-evictable-idle-time-millis:
+      # 通过connectProperties属性来打开mergeSql功能；记录慢SQL
+      connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+      filters: slf4j #sql文不允许写#注释，只可以在xml中写 <!--  -->注释
+      stat-view-servlet:
+        enabled: true
+        login-username: dongke
+        login-password: dongke
+        url-pattern: /druid/*
+        reset-enable: false
+      web-stat-filter:
+        exclusions: "*.js,*.gif,*.jpg,*.css,/druid/*"
+  redis:
+    host: localhost
+    port: 6379
+    password:
+  servlet:
+    multipart:
+      max-file-size: 10MB
 
+logback:
+  file: /data/java_project/dkic/logs
 
+feign:
+  sentinel:
+    enabled: true
+  client:
+    config:
+      default:
+        connectTimeout: 60000
+        readTimeout: 60000
+
+mybatis-plus:
+  configuration:
+    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
+    map-underscore-to-camel-case: true
+    call-setters-on-nulls: true
+  type-aliases-package: com.dk.oauth.dto,com.dk.common.infrastructure.handler #类型转换器包名
+  mapper-locations: classpath:/mapper/**/*Mapper.xml,com/hegii/scrm/common/mapper/opinfo/*.xml
+
+swagger:
+  enabled: true
+
+wx:
+  code2Session: https://qyapi.weixin.qq.com/cgi-bin/miniprogram/jscode2session?
+  accessToken: https://qyapi.weixin.qq.com/cgi-bin/gettoken?
+  appId: wx414cffd0fc05e151
+  appSecret: 868ec372b9da961eb42989559bc9ccc5
+  apiUrl: https://api.weixin.qq.com/sns/jscode2session?
+  #  企信企业id
+  corpid: ww796c5d1684937b2f
+  #  获取企业标签库
+  corp_tag_list: https://qyapi.weixin.qq.com/cgi-bin/externalcontact/get_corp_tag_list?access_token=
+  #  添加企业客户标签
+  add_corp_tag: https://qyapi.weixin.qq.com/cgi-bin/externalcontact/add_corp_tag?access_token=
+  #  编辑企业客户标签
+  edit_corp_tag: https://qyapi.weixin.qq.com/cgi-bin/externalcontact/edit_corp_tag?access_token=
+  #  删除企业客户标签
+  del_corp_tag: https://qyapi.weixin.qq.com/cgi-bin/externalcontact/del_corp_tag?access_token=
+  # 公众号发送消息的api
+  uniform_send: https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=
+  # 公众号发送消息的api-对应获取token
+  token: http://ibossmp.dongkesoft.com:9000/get_access_token
+  # 公众号的appid appSecret 东科软件 公众号
+  wxPublicAccountAppId: wx6bb9335b534f7b28
+  wxPublicAccountAppSecret: 78a99837c113756599d1748b813ca698
+  templateId: V5Ju7-8BfDKJJm1HgH4j5km68rPs777pMVJ0_MKqR00
+
+  # 支付的信息
+  pay:
+    # 商户号 微信支付
+    mchId: 1669762764
+    # 小程序的appid
+    appId: wxe27c8f5249b7aeab
+    # 小程序的appSecret
+    appSecret: 9bd0efa102f148ff4ca09a1152310555
+    # 支付密钥
+    mchKey: 399e76d7db9511ee9c24fa163eacb119
+    # 证书路径
+    keyPath: /mnt/cert/2021/05/11/404727f0-e5be-424e-b009-59f1ec8d102e.p12
+    # 小程序支付的回调接口地址
+    wechatNotifyUrl: https://s.dev01.dkiboss.com:7000/api/mdm-server-dkic-b1/wxapi/basic/wechat/pay/notify/order
+
+
+dongke:
+  base:
+    pojo:
+      valid-key: flg_valid  #db有效标识
+      is-valid: true  #表示有效的值
+      un-valid: false  #表示无效的值
+      delete-key: flg_del  #db删除标识
+      is-delete: true  #表示删除的值
+      un-delete: false  #表示未删除的值
+    dynamic-ds:
+      ds-key: DS
+    ds:
+      table-name:
+
+#  单点登录是否开启
+single-sign-on: false
+uploadPath: ''
+printTemplatePath : ''
+
+aes-key: b6f64c1001b04b9f
+client-app-id: 48849faf-8bbb-4a29-9548-0ba1c3df963f
+
+xxl:
+  job:
+    admin:
+      addresses: http://s.dev01.dkiboss.com:16100
+    accessToken:
+    executor:
+      appname: xxl-job-mini-customer-reminder
+      address:
+      ip:
+      port: 16111
+      logpath: /data/applogs/xxl-job/jobhandler
+      logretentiondays: 30
+  info:
+    plan:
+      job-desc: 跟进任务提醒
+      executo-handler: plan-reminder
+    follow:
+      job-desc: 客户跟进提醒
+      executo-handler: customer-reminder
+  job-group: 1
+  server-url: ${xxl.job.admin.addresses}
+
+
+pdf-folder: /data/java_project/dkic/${spring.application.name}/pdf/
+#  自定义报表导出sql文件路径
+custom-report-sql: /data/java_project/dkic/sql/custom-report-sql.sql
+####apk文件夾
+apk-folder: /data/java_project/dkic/apk/
+####原生android-webiview
+apk-file-name: mes3-v23.05.18.01.apk
+apk-version: 23.05.18.01
+#### X5內核
+apk-file-name-smtt: x5-v23051801.apk
+apk-version-smtt: 23.05.18.01
+#### crosswalk內核
+apk-file-name-crosswalk: crosswalk-v23.05.18.01.apk
+apk-version-crosswalk: 23.05.18.01
+
+excel-folder: /data/java_project/dkic/excel/
+
+#文件上传
+upload-path: /data/java_project/dkic/file/