diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java index 798dd487a..7279b8a20 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java @@ -672,8 +672,8 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{ @ApiModelProperty("$column.columnComment") @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") +// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") +// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date documentDate; diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java index 251d65f39..08e0da384 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java @@ -98,10 +98,8 @@ public class OriginalImportExportDocumentApi extends BaseController { PageHelper.startPage(pageNo, pageSize); List orderList = businessDocumentOrderApplicationService.queryListAndMaterial(businessDocumentOrderDO); - // ✅ 批量查询货物列表并设置到订单 fillCargoInfo(orderList); - // ✅ 获取分页信息 Page page = (Page) orderList; List resultList = convertToOrderWithMaterialList(orderList); diff --git a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml index d56e74b4c..bfe739722 100644 --- a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml @@ -1200,7 +1200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and ORGANIZATION_ID = #{organizationId} + and o.ORGANIZATION_ID = #{organizationId} diff --git a/mhd_oms/src/main/resources/mapper/erpEnterpriseUnit/ErpEnterpriseUnitMapper.xml b/mhd_oms/src/main/resources/mapper/erpEnterpriseUnit/ErpEnterpriseUnitMapper.xml index 828884083..c4a91cbd1 100644 --- a/mhd_oms/src/main/resources/mapper/erpEnterpriseUnit/ErpEnterpriseUnitMapper.xml +++ b/mhd_oms/src/main/resources/mapper/erpEnterpriseUnit/ErpEnterpriseUnitMapper.xml @@ -10,28 +10,28 @@ FROM erp_enterprise_unit WHERE del_flag = 1 - AND erp_code LIKE CONCAT('%', #{do.erpCode}, '%') + AND erp_code LIKE CONCAT('%', #{erpCode}, '%') - AND erp_name LIKE CONCAT('%', #{do.erpName}, '%') + AND erp_name LIKE CONCAT('%', #{erpName}, '%') - AND push_status = #{do.pushStatus} + AND push_status = #{pushStatus} - AND DATE_FORMAT(push_time, '%Y-%m-%d') >= #{do.pushTimeFrom} + AND DATE_FORMAT(push_time, '%Y-%m-%d') >= #{pushTimeFrom} - AND DATE_FORMAT(push_time, '%Y-%m-%d') <= #{do.pushTimeTo} + AND DATE_FORMAT(push_time, '%Y-%m-%d') <= #{pushTimeTo} - AND organization_id = #{do.organizationId} + AND organization_id = #{organizationId} - AND DATE_FORMAT(create_time, '%Y-%m-%d') >= #{do.createTimeFrom} + AND DATE_FORMAT(create_time, '%Y-%m-%d') >= #{createTimeFrom} - AND DATE_FORMAT(create_time, '%Y-%m-%d') <= #{do.createTimeTo} + AND DATE_FORMAT(create_time, '%Y-%m-%d') <= #{createTimeTo} ORDER BY create_time DESC