diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java index c4775c15..d69b8367 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java @@ -90,8 +90,8 @@ public class SfcDispatchDto implements Serializable{ /** * 人员编号 */ - @ExcelColumn("操作者") private String employee; + @ExcelColumn("操作者") private String employeeDescription; /** * 是否转序 diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java index e0e5cb4d..19c5acd4 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java @@ -433,7 +433,7 @@ public class SfcDispatchServiceImpl extends ServiceImplRESOURCE_TYPE=#{et.resourceType}, WORK_CENTER=#{et.workCenter}, RESRCE=#{et.resrce}, - EMPLOYEE=#{et.employee}, - EMPLOYEE_DESCRIPTION=#{et.employeeDescription}, + EMPLOYEE=#{et.employee}, + EMPLOYEE_DESCRIPTION=#{et.employeeDescription}, TURN_OPERATION=#{et.turnOperation}, DISPATCH_QTY=#{et.dispatchQty}, PROD_HOURS=#{et.prodHours}, @@ -692,7 +692,7 @@ LEFT JOIN CUSTOM_FIELDS C2 ON C2.HANDLE = SO.HANDLE AND C2."ATTRIBUTE" = 'ITEM_NUMBER' INNER JOIN ITEM IM ON IM.HANDLE = SO.ITEM_BO LEFT JOIN ITEM_T IT ON IT.ITEM_BO = IM.HANDLE AND IT.LOCALE = 'zh' - LEFT JOIN CUSTOM_FIELDS CC ON CC.HANDLE = IT.HANDLE AND CC.ATTRIBUTE = 'ACCESSORY_TYPE' + LEFT JOIN CUSTOM_FIELDS CC ON CC.HANDLE = IM.HANDLE AND CC.ATTRIBUTE = 'ACCESSORY_TYPE' INNER JOIN OPERATION O ON O.SITE = SD.SITE AND O.OPERATION = SD.OPERATION AND O.CURRENT_REVISION = 'true' LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = 'zh' INNER JOIN BOM_COMPONENT BC ON BC.BOM_BO = SO.BOM_BO @@ -761,16 +761,16 @@ AND C4.VALUE = #{matSpec} - AND SO.PLANNED_START_DATE >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD') + AND SD.PLANNED_START_DATE >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD') - AND SO.PLANNED_START_DATE <= TO_DATE(#{startToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS') + AND SD.PLANNED_START_DATE <= TO_DATE(#{startToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS') - AND SO.PLANNED_COMP_DATE >= TO_DATE(#{completeFromDate}, 'YYYY-MM-DD') + AND SD.PLANNED_COMPLETE_DATE >= TO_DATE(#{completeFromDate}, 'YYYY-MM-DD') - AND SO.PLANNED_COMP_DATE <= TO_DATE(#{completeToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS') + AND SD.PLANNED_COMPLETE_DATE <= TO_DATE(#{completeToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS') GROUP BY SD.HANDLE, SD.SITE, SD.SHOP_ORDER, SD.DISPATCH_NO, C2.VALUE, C1.VALUE, IM.HANDLE, IM.ITEM, IT.DESCRIPTION, SD.SFC, SD.DISPATCH_STATUS, SD.STEP_ID, SD.OPERATION, OT.DESCRIPTION, SD.RESOURCE_TYPE, SD.RESRCE, SD.EMPLOYEE, SD.EMPLOYEE, SD.DISPATCH_QTY, SD.PROD_HOURS, RS.DESCRIPTION,