库存查询报错;
This commit is contained in:
+1
-1
@@ -304,7 +304,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="auditTimeEnd != null and auditTimeEnd != ''">
|
<if test="auditTimeEnd != null and auditTimeEnd != ''">
|
||||||
and date_format(a.audit_time,'%Y-%m-%d') <= #{auditTimeEnd}
|
and date_format(a.audit_time,'%Y-%m-%d') <= #{auditTimeEnd}
|
||||||
</if>
|
</if>
|
||||||
<if test="needDeclareFlag != null">
|
<if test="needDeclareFlag != null and needDeclareFlag != ''">
|
||||||
and a.NEED_DECLARE_FLAG = #{needDeclareFlag}
|
and a.NEED_DECLARE_FLAG = #{needDeclareFlag}
|
||||||
</if>
|
</if>
|
||||||
<if test="pushTimeStart != null">
|
<if test="pushTimeStart != null">
|
||||||
|
|||||||
+6
-4
@@ -87,10 +87,12 @@ public class MaterialInventoryApi extends BaseController {
|
|||||||
materialInventoryDO.setExpiryDateStr(materialInventoryDTO.getExpiryDate());
|
materialInventoryDO.setExpiryDateStr(materialInventoryDTO.getExpiryDate());
|
||||||
materialInventoryDO.setProductionDateStr(materialInventoryDTO.getProductionDate());
|
materialInventoryDO.setProductionDateStr(materialInventoryDTO.getProductionDate());
|
||||||
Date updateTime = materialInventoryDTO.getUpdateTime();
|
Date updateTime = materialInventoryDTO.getUpdateTime();
|
||||||
LocalDateTime localDateTime = updateTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
|
if (updateTime != null) {
|
||||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
LocalDateTime localDateTime = updateTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
|
||||||
String dateStr = localDateTime.format(formatter);
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
||||||
materialInventoryDO.setUpdateTimeStr(dateStr);
|
String dateStr = localDateTime.format(formatter);
|
||||||
|
materialInventoryDO.setUpdateTimeStr(dateStr);
|
||||||
|
}
|
||||||
startPage();
|
startPage();
|
||||||
// 使用带批次属性的查询方法,批次属性值从库存表中获取
|
// 使用带批次属性的查询方法,批次属性值从库存表中获取
|
||||||
List<MaterialInventoryPO> list = materialInventoryApplicationService.queryListWithBatchAttributes(materialInventoryDO);
|
List<MaterialInventoryPO> list = materialInventoryApplicationService.queryListWithBatchAttributes(materialInventoryDO);
|
||||||
|
|||||||
Reference in New Issue
Block a user