导入bug修改

ruoyi-admin-vue/src/views/inventory/orders/index.vue

@@ -78,19 +78,23 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="出库类型" prop="orderTypeId">
-          <el-input
-            v-model="queryParams.orderTypeId"
-            placeholder="请输入出库类型"
+        <!-- 【保留位置】时间段选择器固定在第三个位置 -->
+        <el-form-item label="时间段" prop="dateRange">
+          <el-date-picker
             clearable
-            @keyup.enter.native="handleQuery"
+            v-model="queryParams.dateRange"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+            style="width: 100%"
           />
         </el-form-item>
-        <!-- 新增：订单类型查询项 -->
-        <el-form-item label="订单类型" prop="orderType">
+        <el-form-item label="出库类型" prop="orderTypeId">
            <el-select
-            v-model="queryParams.orderType"
-            placeholder="请选择订单类型"
+            v-model="queryParams.orderTypeId"
+            placeholder="请输入出库类型"
             clearable
             style="width: 100%"
           >
@@ -102,6 +106,7 @@
             />
           </el-select>
         </el-form-item>
+      
         <el-form-item label="批次" prop="batchCode">
           <el-input
             v-model="queryParams.batchCode"
@@ -110,19 +115,6 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <!-- 【核心修改1】出库日期改为时间段选择器 -->
-        <el-form-item label="时间段" prop="dateRange">
-          <el-date-picker
-            clearable
-            v-model="queryParams.dateRange"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="yyyy-MM-dd"
-            style="width: 100%"
-          />
-        </el-form-item>
         <el-form-item label="订单状态" prop="orderStatus">
           <el-select
             v-model="queryParams.orderStatus"
@@ -617,7 +609,7 @@ export default {
         warehouseId: null,
         ownerId: null,
         orderStatus: null,
-        dateRange: null, // 日期范围选择器绑定
+        dateRange: null, // 日期范围选择器绑定（固定在第三个搜索位置）
         startDate: null, // 开始日期
         endDate: null,   // 结束日期
         destination: null,
@@ -1241,7 +1233,7 @@ export default {
           warehouseId: null,
           ownerId: null,
           orderStatus: null,
-          dateRange: null, // 重置日期范围
+          dateRange: null, // 重置日期范围（固定在第三个位置）
           startDate: null,
           endDate: null,
           destination: null,

ruoyi-inventory/src/main/java/com/ruoyi/inventory/service/impl/StorageLocationsServiceImpl.java

@@ -36,10 +36,11 @@ public class StorageLocationsServiceImpl implements IStorageLocationsService
 {
     @Autowired
     private StorageLocationsMapper storageLocationsMapper;
-    @Autowired
-    private StorageLocationsCategoryMapper storageLocationsCategoryMapper;
-    @Autowired
-    private MaterialsMapper materialsMapper;
+    // 注释掉关联mapper（如果不需要可直接删除）
+    // @Autowired
+    // private StorageLocationsCategoryMapper storageLocationsCategoryMapper;
+    // @Autowired
+    // private MaterialsMapper materialsMapper;
 
     /**
      * 查询库位
@@ -51,7 +52,8 @@ public class StorageLocationsServiceImpl implements IStorageLocationsService
     public StorageLocations selectStorageLocationsById(String id)
     {
         StorageLocations storageLocations = storageLocationsMapper.selectStorageLocationsById(id);
-        String AllowedCategoryName = "";
+        // 注释掉物料反显逻辑
+        /*String AllowedCategoryName = "";
         if (storageLocations.getAllowedCategoryIds() != null) {
             String[] AllowedCategoryIds = storageLocations.getAllowedCategoryIds().split(",");
             if (AllowedCategoryIds != null && AllowedCategoryIds.length > 0) {
@@ -67,7 +69,7 @@ public class StorageLocationsServiceImpl implements IStorageLocationsService
                 }
             }
         }
-        storageLocations.setAllowedCategoryNames(AllowedCategoryName);
+        storageLocations.setAllowedCategoryNames(AllowedCategoryName);*/
         return storageLocations;
     }
 
@@ -91,7 +93,8 @@ public class StorageLocationsServiceImpl implements IStorageLocationsService
     public List<StorageLocations> selectStorageLocationsList(StorageLocations storageLocations)
     {
         List<StorageLocations> storageLocations1 = storageLocationsMapper.selectStorageLocationsList(storageLocations);
-        for (StorageLocations storageLocations2 : storageLocations1){
+        // 注释掉物料反显逻辑
+        /*for (StorageLocations storageLocations2 : storageLocations1){
             String AllowedCategoryName = "";
             if (storageLocations2.getAllowedCategoryIds() != null && !storageLocations2.getAllowedCategoryIds().isEmpty()){
                 String[] AllowedCategoryIds = storageLocations2.getAllowedCategoryIds().split(",");
@@ -107,7 +110,7 @@ public class StorageLocationsServiceImpl implements IStorageLocationsService
                 }
             }
             storageLocations2.setAllowedCategoryNames(AllowedCategoryName);
-        }
+        }*/
         return storageLocations1;
     }
 
@@ -122,14 +125,15 @@ public class StorageLocationsServiceImpl implements IStorageLocationsService
     {
         storageLocations.setCreateTime(DateUtils.getNowDate());
 
-        StorageLocationsCategory storageLocationsCategory = new StorageLocationsCategory();
-        BeanUtils.copyBeanProp(storageLocationsCategory,storageLocations);
+        // 注释掉所有库位分类关联逻辑
+        /*StorageLocationsCategory storageLocationsCategory = new StorageLocationsCategory();
+        BeanUtils.copyBeanProp(storageLocationsCategory,storageLocations);*/
         String LocationsID = UUID.randomUUID().toString();
         storageLocations.setId(LocationsID);
         storageLocations.setCreateTime(DateUtils.getNowDate());
         storageLocations.setCreateUserCode(String.valueOf(SecurityUtils.getUserId()));
         storageLocations.setWarehousesId(WarehouseConfig.DEFAULT_WAREHOUSE_ID);
-        storageLocationsCategory.setLocationCode(LocationsID);
+        /*storageLocationsCategory.setLocationCode(LocationsID);
 
 
         if (storageLocations.getAllowedCategoryIds() != null && !storageLocations.getAllowedCategoryIds().isEmpty()){
@@ -143,7 +147,7 @@ public class StorageLocationsServiceImpl implements IStorageLocationsService
                 storageLocationsCategory.setCategoryName(materials.getMaterialName());
                 storageLocationsCategoryMapper.insertStorageLocationsCategory(storageLocationsCategory);
             }
-        }
+        }*/
         return storageLocationsMapper.insertStorageLocations(storageLocations);
     }
 
@@ -162,7 +166,8 @@ public class StorageLocationsServiceImpl implements IStorageLocationsService
         String LocationsID = storageLocations.getId();
         String LocationsCode = storageLocations.getLocationCode();
         StorageLocations storageLocations1 = storageLocationsMapper.selectStorageLocationsById(LocationsID);
-        if (storageLocations1.getAllowedCategoryIds()!=storageLocations.getAllowedCategoryIds()||storageLocations1.getIsEnabled()!=storageLocations.getIsEnabled()){
+        // 注释掉库位分类关联修改逻辑
+        /*if (storageLocations1.getAllowedCategoryIds()!=storageLocations.getAllowedCategoryIds()||storageLocations1.getIsEnabled()!=storageLocations.getIsEnabled()){
             storageLocationsCategoryMapper.deleteStorageLocationsCategoryByLocationCode(LocationsID);
 
             String[] CategoryId = storageLocations.getAllowedCategoryIds().split(",");
@@ -179,7 +184,7 @@ public class StorageLocationsServiceImpl implements IStorageLocationsService
                 storageLocationsCategory.setCategoryName(materials.getMaterialName());
                 storageLocationsCategoryMapper.insertStorageLocationsCategory(storageLocationsCategory);
             }
-        }
+        }*/
 
         return storageLocationsMapper.updateStorageLocations(storageLocations);
     }
@@ -205,14 +210,14 @@ public class StorageLocationsServiceImpl implements IStorageLocationsService
     @Override
     public int deleteStorageLocationsById(String id)
     {
-        storageLocationsCategoryMapper.deleteStorageLocationsCategoryById(id);
+        // 注释掉关联的库位分类删除逻辑
+        // storageLocationsCategoryMapper.deleteStorageLocationsCategoryById(id);
         return storageLocationsMapper.deleteStorageLocationsById(id);
     }
 
     @Override
     public int updateLocationsCategoryStatus(String id)
     {
-
         return storageLocationsMapper.updateStorageLocationsStatus(id);
     }
 

ruoyi-inventory/src/main/resources/mapper/inventory/MaterialsMapper.xml

@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         m.is_serial_managed,
         m.min_stock_level,
         m.max_stock_level,
-        IFNULL(i.quantity-locked_quantity, 0) as stock,  -- 无库存时默认显示0
+        IFNULL(stock_sum.total_stock, 0) as stock,
         m.is_used,
         m.is_active,
         m.risk_level,
@@ -107,7 +107,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         m.update_time,
         m.update_user_code
         from materials m
-        left join inventory i on m.id = i.material_id
+        left join (
+        select
+        material_id,
+        SUM(quantity - locked_quantity) as total_stock
+        from inventory
+        group by material_id
+        ) stock_sum on m.id = stock_sum.material_id
         <where>
             m.is_used = 1
             <if test="materialCode != null  and materialCode != ''"> and m.material_code like concat('%', #{materialCode}, '%')</if>
@@ -135,8 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sortNo != null "> and m.sort_no = #{sortNo}</if>
             <if test="createTime != null "> and m.create_time like concat('%', #{createTime}, '%')</if>
             <if test="updateTime != null "> and m.update_time like concat('%', #{updateTime}, '%')</if>
-            -- 可选：添加库存数量的查询条件（如果需要）
-            <if test="stock != null "> and i.stock = #{stock}</if>
+            <if test="stock != null "> and stock_sum.total_stock = #{stock}</if>
         </where>
         order by stock desc
     </select>

ruoyi-inventory/src/main/resources/mapper/inventory/OutboundOrderItemsMapper.xml

@@ -329,8 +329,9 @@
         left join storage_locations sl on oi.location_id = sl.id
         <where>
             oi.is_used = 1 and o.is_used = 1
+
             <if test="orderId != null  and orderId != ''"> and oi.order_id like concat('%', #{orderId}, '%')</if>
-            <if test="materialId != null  and materialId != ''"> and oi.material_id = #{materialId}</if>
+            <if test="materialId != null  and materialId != ''"> and oi.material_id like concat('%', #{materialId}, '%')</if>
             <if test="batchCode != null  and batchCode != ''"> and oi.batch_code = #{batchCode}</if>
             <if test="warehouseId != null  and warehouseId != ''"> and oi.warehouse_id = #{warehouseId}</if>
             <if test="locationId != null  and locationId != ''"> and oi.location_id = #{locationId}</if>

ruoyi-inventory/src/main/resources/mapper/inventory/OutboundOrdersMapper.xml

@@ -105,15 +105,15 @@
 
     <select id="selectOutboundOrdersList" parameterType="OutboundOrders" resultMap="OutboundOrdersOutboundOrderItemsResult">
         <include refid="selectOutboundOrdersVo"/>
-        <if test="orderId != null  and orderId != ''"> and oo.order_id = #{orderId}</if>
-        <if test="systemNo != null  and systemNo != ''"> and oo.system_no = #{systemNo}</if>
-        <if test="orderTypeId != null  and orderTypeId != ''"> and oo.order_type_id = #{orderTypeId}</if>
+        <if test="orderId != null  and orderId != ''"> and oo.order_id like concat('%', #{orderId}, '%')</if>
+        <if test="batchCode != null  and batchCode != ''"> and oo.batch_code like concat('%', #{batchCode}, '%')</if>
+        <if test="systemNo != null  and systemNo != ''"> and oo.system_no like concat('%', #{systemNo}, '%')</if>
+        <if test="orderTypeId != null  and orderTypeId != ''"> and oo.order_type_id = {orderTypeId}</if>
         <if test="orderType != null  and orderType != ''"> and oo.order_type = #{orderType}</if>
-        <if test="batchCode != null  and batchCode != ''"> and oo.batch_code = #{batchCode}</if>
+        <if test="batchCode != null  and batchCode != ''"> and oo.batch_code like concat('%', #{batchCode}, '%')</if>
         <if test="warehouseId != null  and warehouseId != ''"> and oo.warehouse_id = #{warehouseId}</if>
         <if test="ownerId != null  and ownerId != ''"> and oo.owner_id = #{ownerId}</if>
         <if test="orderStatus != null "> and oo.order_status = #{orderStatus}</if>
-        <!-- 新增 isImport 查询条件 -->
         <if test="isImport != null "> and oo.is_import = #{isImport}</if>
         <if test="startDate != null"> and oo.inbound_date &gt;= #{startDate}</if>
         <if test="endDate != null"> and oo.inbound_date &lt;= #{endDate}</if>

ruoyi-inventory/src/main/resources/mapper/inventory/OwnersMapper.xml

@@ -33,16 +33,15 @@
     <select id="selectOwnersList" parameterType="Owners" resultMap="OwnersResult">
         <include refid="selectOwnersVo"/>
         where is_used = 1
-        <if test="ownerCode != null  and ownerCode != ''"> and owner_code = #{ownerCode}</if>
+        <if test="ownerCode != null  and ownerCode != ''"> and owner_code like concat('%', #{ownerCode}, '%')</if>
         <if test="ownerName != null  and ownerName != ''"> and owner_name like concat('%', #{ownerName}, '%')</if>
-        <!-- 新增englishName查询条件 -->
         <if test="englishName != null  and englishName != ''"> and english_name like concat('%', #{englishName}, '%')</if>
         <if test="ownerType != null "> and owner_type = #{ownerType}</if>
         <if test="contactPerson != null  and contactPerson != ''"> and contact_person = #{contactPerson}</if>
         <if test="contactPhone != null  and contactPhone != ''"> and contact_phone = #{contactPhone}</if>
         <if test="email != null  and email != ''"> and email = #{email}</if>
         <if test="address != null  and address != ''"> and address = #{address}</if>
-        <if test="taxNumber != null  and taxNumber != ''"> and tax_number = #{taxNumber}</if>
+        <if test="taxNumber != null  and taxNumber != ''"> and tax_number like concat('%', #{taxNumber}, '%')</if>
         <if test="bankAccount != null  and bankAccount != ''"> and bank_account = #{bankAccount}</if>
         <if test="isActive != null "> and is_active = #{isActive}</if>
         <if test="sortNo != null "> and sort_no = #{sortNo}</if>

ruoyi-inventory/src/main/resources/mapper/inventory/StorageLocationsMapper.xml

@@ -82,11 +82,11 @@
     <!-- 原有列表查询（简化：移除重复的is_used=1，条件改为and开头） -->
     <select id="selectStorageLocationsList" parameterType="StorageLocations" resultMap="StorageLocationsWithWarehousesResult">
         <include refid="selectStorageLocationsWithWarehousesVo"/>
-        <if test="locationCode != null  and locationCode != ''"> and sl.location_code = #{locationCode}</if>
+        <if test="locationCode != null  and locationCode != ''"> and sl.location_code like concat('%', #{locationCode}, '%')</if>
         <if test="locationName != null  and locationName != ''"> and sl.location_name like concat('%', #{locationName}, '%')</if>
         <if test="warehousesCode != null  and warehousesCode != ''"> and sl.warehouses_code = #{warehousesCode}</if>
         <if test="locationType != null "> and sl.location_type = #{locationType}</if>
-        <if test="zoneCode != null  and zoneCode != ''"> and sl.zone_code = #{zoneCode}</if>
+        <if test="zoneCode != null  and zoneCode != ''"> and sl.zone_code like concat('%', #{zoneCode}, '%')</if>
         <if test="rowCode != null  and rowCode != ''"> and sl.row_code = #{rowCode}</if>
         <if test="columnCode != null  and columnCode != ''"> and sl.column_code = #{columnCode}</if>
         <if test="layerCode != null  and layerCode != ''"> and sl.layer_code = #{layerCode}</if>
@@ -104,7 +104,7 @@
         <if test="LocationUsage != null  and LocationUsage != ''"> and sl.location_usage = #{LocationUsage}</if>
         <if test="locationHandling != null  and locationHandling != ''"> and sl.location_handling = #{locationHandling}</if>
         <if test="turnoverDemand != null  and turnoverDemand != ''"> and sl.turnover_demand = #{turnoverDemand}</if>
-        <if test="pickingArea != null  and pickingArea != ''"> and sl.picking_area = #{pickingArea}</if>
+        <if test="pickingArea != null  and pickingArea != ''"> and sl.picking_area like concat('%', #{pickingArea}, '%')</if>
         <if test="warehousesId != null  and warehousesId != ''"> and sl.warehouses_id = #{warehousesId}</if>
         <if test="allowMixedProducts != null "> and sl.allow_mixed_products = #{allowMixedProducts}</if>
         <if test="allowMixedBatches != null "> and sl.allow_mixed_batches = #{allowMixedBatches}</if>

ruoyi-inventory/src/main/resources/mapper/inventory/WarehousesMapper.xml

@@ -30,13 +30,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectWarehousesList" parameterType="Warehouses" resultMap="WarehousesResult">
         <include refid="selectWarehousesVo"/>
             where is_used=1 and id != #{localId}
-            <if test="warehousesCode != null  and warehousesCode != ''"> and warehouses_code = #{warehousesCode}</if>
+        <if test="warehousesCode != null  and warehousesCode != ''"> and warehouses_code like concat('%', #{warehousesCode}, '%')</if>
             <if test="warehousesName != null  and warehousesName != ''"> and warehouses_name like concat('%', #{warehousesName}, '%')</if>
             <if test="warehouseType != null "> and warehouse_type = #{warehouseType}</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="area != null "> and area = #{area}</if>
             <if test="capacity != null "> and capacity = #{capacity}</if>
-            <if test="manager != null  and manager != ''"> and manager = #{manager}</if>
+        <if test="manager != null  and manager != ''"> and manager like concat('%', #{manager}, '%')</if>
             <if test="contactPhone != null  and contactPhone != ''"> and contact_phone = #{contactPhone}</if>
             <if test="isEnabled != null "> and is_enabled = #{isEnabled}</if>
             <if test="isUsed != null "> and is_used = #{isUsed}</if>