weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_lzh_wms_20260120' into wms_dev

Browse Source
This commit is contained in:
zhou-hongcheng
2026-01-23 15:31:44 +08:00
parent ca4b1ce2a3 a51e6e3f3d
commit 3196c3416a
41 changed files with 1424 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/resources/bootstrap.yml
+8 -4
View File
@@ -14,7 +14,9 @@ spring:
nacos:
discovery:
# 服务注册地址
#server-addr: 127.0.0.1:8848
server-addr: 127.0.0.1:8848
username: nacos
password: manhuoda@2023
# 演示环境
# server-addr: 47.92.229.169:8848
# 测试开发环境
@@ -24,10 +26,12 @@ spring:
# 大运通泰生产环境
# server-addr: 39.107.137.158:8848
# 线上测试环境
server-addr: 116.204.23.92:8848
# server-addr: 116.204.23.92:8848
config:
# 配置中心地址
#server-addr: 127.0.0.1:8848
server-addr: 127.0.0.1:8848
username: nacos
password: manhuoda@2023
# 演示环境
# server-addr: 47.92.229.169:8848
# 测试开发环境
@@ -37,7 +41,7 @@ spring:
# 大运通泰生产环境
# server-addr: 39.107.137.158:8848
# 线上测试环境
server-addr: 116.204.23.92:8848
# server-addr: 116.204.23.92:8848
# 配置文件格式
file-extension: yml
# 共享配置
mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
+1 -1
View File
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectMaterialBaseInfoPo">
select material_base_info_id, organization_id, organization_name, top_organization_id, shipper_id, shipper_code, shipper_name, material_code, material_name, bar_code, material_classify_code, material_classify_name, material_type, material_type_name, pack_id, pack_code, pack_name, unit_code, unit_name, brand_id, brand_code, brand_name, shelf_life, weight_limit, volume_limit, material_shape, material_shape_name, material_size, material_length, material_width, material_height, remark, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag,common from material_base_info
select material_base_info_id, organization_id, organization_name, top_organization_id, shipper_id, shipper_code, shipper_name, material_code, material_name, bar_code, material_classify_code, material_classify_name, material_type, material_type_name, pack_id, pack_code, pack_name, unit_code, unit_name, brand_id, brand_code, brand_name, shelf_life, weight_limit, volume_limit, material_shape, material_shape_name, material_size, material_length, material_width, material_height, remark, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag,common,sku_code, unit_price, currency, origin_country, hs_code, declaration_unit, statutory_unit, statutory_second_unit,specification_Model from material_base_info
</sql>
<sql id="JoinMaterialBaseInfoPo">