diff --git a/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/dailyplan/DailyPlanMapper.xml b/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/dailyplan/DailyPlanMapper.xml index 4c68e3e5..e3d41047 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/dailyplan/DailyPlanMapper.xml +++ b/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/dailyplan/DailyPlanMapper.xml @@ -57,6 +57,7 @@ FROM lms_daily_plan WHERE deleted = b'0' AND order_status = #{reqVO.orderStatus} + AND #{reqVO.orderStatus} IN (1, 3) ORDER BY sort_seq ASC, daily_plan_id ASC @@ -109,7 +110,7 @@ previous_order_status, previous_stocking_status, previous_sleeving_status, order_start_time, order_end_time, stocking_start_time, stocking_complete_time, sleeving_start_time, sleeving_complete_time, version, - creator, create_time, updater, update_time, deleted, tenant_id) + creator, updater) VALUES (#{plan.dailyPlanId}, #{plan.planCode}, #{plan.sourceType}, #{plan.erpOrderCode}, #{plan.manualOrderCode}, #{plan.planDate}, #{plan.materialId}, #{plan.materialCode}, #{plan.materialName}, #{plan.materialSpec}, @@ -118,7 +119,7 @@ #{plan.previousOrderStatus}, #{plan.previousStockingStatus}, #{plan.previousSleevingStatus}, #{plan.orderStartTime}, #{plan.orderEndTime}, #{plan.stockingStartTime}, #{plan.stockingCompleteTime}, #{plan.sleevingStartTime}, #{plan.sleevingCompleteTime}, #{plan.version}, - #{plan.creator}, #{plan.createTime}, #{plan.updater}, #{plan.updateTime}, #{plan.deleted}, #{plan.tenantId}) + #{plan.creator}, #{plan.updater}) diff --git a/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/dailyplan/DailyPlanOperationLogMapper.xml b/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/dailyplan/DailyPlanOperationLogMapper.xml index 631c6cc8..e0fdcf16 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/dailyplan/DailyPlanOperationLogMapper.xml +++ b/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/dailyplan/DailyPlanOperationLogMapper.xml @@ -12,14 +12,13 @@ INSERT INTO lms_daily_plan_operation_log (operation_log_id, daily_plan_id, operation_target, operation_type, before_value, after_value, change_qty, operation_reason, - operator, operation_time, deleted, tenant_id) + operator, operation_time) VALUES (#{operationLog.operationLogId}, #{operationLog.dailyPlanId}, #{operationLog.operationTarget}, #{operationLog.operationType}, #{operationLog.beforeValue}, #{operationLog.afterValue}, #{operationLog.changeQty}, #{operationLog.operationReason}, - #{operationLog.operator}, #{operationLog.operationTime}, - #{operationLog.deleted}, #{operationLog.tenantId}) + #{operationLog.operator}, #{operationLog.operationTime})