Merge branch 'dev-ty1.2' into test

# Conflicts: # mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
2026-09-14 17:00:41 +08:00
parent 0314d80bca e59173b3f9
commit 29cbf80b7b
55 changed files with 3638 additions and 72 deletions
@@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="orderNoGenerateRule"    column="ORDER_NO_GENERATE_RULE"    />
        <result property="inOrderNoPrefix"    column="IN_ORDER_NO_PREFIX"    />
        <result property="outOrderNoPrefix"    column="OUT_ORDER_NO_PREFIX"    />
+        <result property="stockLockMode"    column="STOCK_LOCK_MODE"    />
    </resultMap>


@@ -51,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               warehouse_type, warehouse_type_name, warehouse_structure, warehouse_nature, warm_layer_code, warm_layer_name,
               director_name, director_phone, region_code, region_name, detail_address, longitude, latitude, building_region,
               usage_region, remark, opening_up, nullify, create_time, create_by, create_by_name, update_time, update_by,
-               update_by_name, del_flag, IS_ENABLE ,WORK_MODE,TASK_MODE,SAMPLE_OUT_ORDER_NO_PREFIX,ORDER_NO_GENERATE_RULE,IN_ORDER_NO_PREFIX,
+               update_by_name, del_flag, IS_ENABLE ,WORK_MODE,TASK_MODE,STOCK_LOCK_MODE,SAMPLE_OUT_ORDER_NO_PREFIX,ORDER_NO_GENERATE_RULE,IN_ORDER_NO_PREFIX,
               OUT_ORDER_NO_PREFIX
        from warehouse
    </sql>