库存添加更新时间查询条件;

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java

@@ -249,4 +249,5 @@ public class MaterialInventoryDO extends MaterialBaseDO {
     private Boolean excludeZeroInventoryQuantity;
     private String expiryDateStr;
     private String productionDateStr;
+    private String updateTimeStr;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java

@@ -23,6 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
 
@@ -83,6 +86,11 @@ public class MaterialInventoryApi extends BaseController {
         MaterialInventoryDO materialInventoryDO = materialInventoryAssembler.toDO(materialInventoryDTO);
         materialInventoryDO.setExpiryDateStr(materialInventoryDTO.getExpiryDate());
         materialInventoryDO.setProductionDateStr(materialInventoryDTO.getProductionDate());
+        Date updateTime = materialInventoryDTO.getUpdateTime();
+        LocalDateTime localDateTime = updateTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        String dateStr = localDateTime.format(formatter);
+        materialInventoryDO.setUpdateTimeStr(dateStr);
         startPage();
         // 使用带批次属性的查询方法，批次属性值从库存表中获取
         List<MaterialInventoryPO> list = materialInventoryApplicationService.queryListWithBatchAttributes(materialInventoryDO);

mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml

@@ -238,6 +238,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="productionDateStr != null and productionDateStr != ''">
             AND TO_CHAR(a.production_date, 'yyyy-MM-dd') = #{productionDateStr}
         </if>
+        <if test="updateTimeStr != null and updateTimeStr != ''">
+            AND TO_CHAR(a.update_time, 'yyyy-MM-dd') = #{updateTimeStr}
+        </if>
     </sql>
 
     <!-- 与 selectMaterialInventoryPo1 相同条件，表别名为 mi（用于 queryListByWl 最新明细子查询） -->
@@ -381,7 +384,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="selectMaterialInventoryPo1"/>
             <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
         </where>
-        GROUP BY a.MATERIAL_BASE_INFO_ID,a.WAREHOUSE_ID,a.STORAGE_SECTION_ID,a.STORAGE_LOCATION_ID
+        GROUP BY a.MATERIAL_BASE_INFO_ID,a.WAREHOUSE_ID,a.STORAGE_SECTION_ID,a.STORAGE_LOCATION_ID order by a.update_time desc
     </select>
 
     <select id="queryListByKw" parameterType="com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO" resultMap="MaterialInventoryResult">
@@ -394,7 +397,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="selectMaterialInventoryPo1"/>
             <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
         </where>
-        GROUP BY a.WAREHOUSE_ID,a.STORAGE_SECTION_ID,a.STORAGE_LOCATION_ID
+        GROUP BY a.WAREHOUSE_ID,a.STORAGE_SECTION_ID,a.STORAGE_LOCATION_ID order by a.update_time desc
     </select>
 
     <select id="queryListByWl" parameterType="com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO" resultMap="MaterialInventoryResult">
@@ -427,7 +430,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY a.MATERIAL_BASE_INFO_ID,
                  loc.warehouse_id, loc.warehouse_code, loc.warehouse_name,
                  loc.storage_section_id, loc.storage_code, loc.storage_name,
-                 loc.storage_location_id, loc.storage_location_code, loc.storage_location_name
+                 loc.storage_location_id, loc.storage_location_code, loc.storage_location_name order by a.update_time desc
     </select>
 
     <!-- 按货主+物料汇总：A货主物料1、A货主物料2、B货主物料1、B货主物料2 为 4 行；库位取该货主+该物料下创建时间最新的一条明细 -->
@@ -461,7 +464,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY a.SHIPPER_ID, a.MATERIAL_BASE_INFO_ID,
                  loc.warehouse_id, loc.warehouse_code, loc.warehouse_name,
                  loc.storage_section_id, loc.storage_code, loc.storage_name,
-                 loc.storage_location_id, loc.storage_location_code, loc.storage_location_name
+                 loc.storage_location_id, loc.storage_location_code, loc.storage_location_name order by a.update_time desc
     </select>
 
     <select id="queryListByHz" parameterType="com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO" resultMap="MaterialInventoryResult">
@@ -474,7 +477,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="selectMaterialInventoryPo1"/>
             <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
         </where>
-        GROUP BY a.SHIPPER_ID
+        GROUP BY a.SHIPPER_ID order by a.update_time desc
     </select>
 
     <resultMap type="com.mhd.wms.domain.materialInventory.repository.po.MaterialInventoryQueryListPO" id="MaterialQueryListResult">