现场调试修改 入库 出库 放货重新分配货位

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:sqlserver://172.16.2.170:1433;databaseName=FT541-wms;encrypt=true;trustServerCertificate=true;
+                url: jdbc:sqlserver://127.0.0.1:1433;databaseName=FT541-wms;encrypt=true;trustServerCertificate=true;
                 username: sa
                 password: Flrd0914.
             # 从库数据源

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

@@ -71,7 +71,7 @@ spring:
     # redis 配置
     redis:
       # 地址
-      host: 172.16.2.170
+      host: 127.0.0.1
       # 端口，默认为6379
       port: 6379
       # 数据库索引

ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml

@@ -182,12 +182,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM bas_cargo_space
         WHERE status = '1'
           and locked = 'N'
-        <if test="warehouseId != null">
             and warehouse_id = #{warehouseId}
-        </if>
-        <if test="roadwayId != null">
             and roadway_id = #{roadwayId}
-        </if>
         ORDER BY the_platoon, the_floor,the_column
     </select>
     <select id="selectBasCargoSpaceListByRoadway" parameterType="BasCargoSpace" resultMap="BasCargoSpaceResult">

ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml

@@ -370,7 +370,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                mjd.spec,
                mjd.unit,
                mj.tray_code,
-               mj.warehosue_id
+               mj.warehouse_id
 
         from mydo_job_detail mjd
          left join bas_product bp on mjd.product_id = bp.product_id