diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/OrderBomInfoMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/OrderBomInfoMapper.java index 1030003..28672b8 100644 --- a/aucma-base/src/main/java/com/aucma/base/mapper/OrderBomInfoMapper.java +++ b/aucma-base/src/main/java/com/aucma/base/mapper/OrderBomInfoMapper.java @@ -75,7 +75,7 @@ public interface OrderBomInfoMapper * @param materialCode * @return */ - List selectChildrenBomById(String materialCode); + List selectChildrenBomById(@Param("materialCode") String materialCode); /** * 修改子元素关系 diff --git a/aucma-base/src/main/resources/mapper/base/OrderBomInfoMapper.xml b/aucma-base/src/main/resources/mapper/base/OrderBomInfoMapper.xml index 7e4a22a..a1b4389 100644 --- a/aucma-base/src/main/resources/mapper/base/OrderBomInfoMapper.xml +++ b/aucma-base/src/main/resources/mapper/base/OrderBomInfoMapper.xml @@ -86,7 +86,8 @@ @@ -174,7 +175,8 @@ diff --git a/aucma-production/src/main/resources/mapper/production/ProdOrderNoteMapper.xml b/aucma-production/src/main/resources/mapper/production/ProdOrderNoteMapper.xml index 2bacfdc..2e93acf 100644 --- a/aucma-production/src/main/resources/mapper/production/ProdOrderNoteMapper.xml +++ b/aucma-production/src/main/resources/mapper/production/ProdOrderNoteMapper.xml @@ -63,21 +63,22 @@ obj_id, order_code, note_type, note_content, status, remark, create_by, create_time, update_by, update_time ) values ( - #{objId}, #{orderCode}, #{noteType}, #{noteContent}, #{status}, #{remark}, - #{createdBy}, #{createdTime}, #{updatedBy}, #{updatedTime} + #{objId,jdbcType=NUMERIC}, #{orderCode,jdbcType=VARCHAR}, #{noteType,jdbcType=VARCHAR}, + #{noteContent,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, + #{createdBy,jdbcType=VARCHAR}, #{createdTime,jdbcType=DATE}, #{updatedBy,jdbcType=VARCHAR}, #{updatedTime,jdbcType=DATE} ) update prod_order_note - order_code = #{orderCode}, - note_type = #{noteType}, - note_content = #{noteContent}, - status = #{status}, - remark = #{remark}, - update_by = #{updatedBy}, - update_time = #{updatedTime} + order_code = #{orderCode,jdbcType=VARCHAR}, + note_type = #{noteType,jdbcType=VARCHAR}, + note_content = #{noteContent,jdbcType=VARCHAR}, + status = #{status,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + update_by = #{updatedBy,jdbcType=VARCHAR}, + update_time = #{updatedTime,jdbcType=DATE} where obj_id = #{objId} diff --git a/aucma-production/src/main/resources/mapper/production/ProdRouteMapper.xml b/aucma-production/src/main/resources/mapper/production/ProdRouteMapper.xml index 85cc8a0..9b1d48e 100644 --- a/aucma-production/src/main/resources/mapper/production/ProdRouteMapper.xml +++ b/aucma-production/src/main/resources/mapper/production/ProdRouteMapper.xml @@ -100,22 +100,23 @@ obj_id, route_code, route_name, material_code, version_no, status, remark, create_by, create_time, update_by, update_time ) values ( - #{objId}, #{routeCode}, #{routeName}, #{materialCode}, #{versionNo}, #{status}, #{remark}, - #{createdBy}, #{createdTime}, #{updatedBy}, #{updatedTime} + #{objId,jdbcType=NUMERIC}, #{routeCode,jdbcType=VARCHAR}, #{routeName,jdbcType=VARCHAR}, + #{materialCode,jdbcType=VARCHAR}, #{versionNo,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, + #{createdBy,jdbcType=VARCHAR}, #{createdTime,jdbcType=DATE}, #{updatedBy,jdbcType=VARCHAR}, #{updatedTime,jdbcType=DATE} ) update prod_route - route_code = #{routeCode}, - route_name = #{routeName}, - material_code = #{materialCode}, - version_no = #{versionNo}, - status = #{status}, - remark = #{remark}, - update_by = #{updatedBy}, - update_time = #{updatedTime} + route_code = #{routeCode,jdbcType=VARCHAR}, + route_name = #{routeName,jdbcType=VARCHAR}, + material_code = #{materialCode,jdbcType=VARCHAR}, + version_no = #{versionNo,jdbcType=VARCHAR}, + status = #{status,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + update_by = #{updatedBy,jdbcType=VARCHAR}, + update_time = #{updatedTime,jdbcType=DATE} where obj_id = #{objId} @@ -139,8 +140,9 @@ obj_id, route_code, process_code, sort_no, required_flag, standard_work_time, remark, create_by, create_time, update_by, update_time ) values ( - #{objId}, #{routeCode}, #{processCode}, #{sortNo}, #{requiredFlag}, #{standardWorkTime}, #{remark}, - #{createdBy}, #{createdTime}, #{updatedBy}, #{updatedTime} + #{objId,jdbcType=NUMERIC}, #{routeCode,jdbcType=VARCHAR}, #{processCode,jdbcType=VARCHAR}, + #{sortNo,jdbcType=NUMERIC}, #{requiredFlag,jdbcType=VARCHAR}, #{standardWorkTime,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, + #{createdBy,jdbcType=VARCHAR}, #{createdTime,jdbcType=DATE}, #{updatedBy,jdbcType=VARCHAR}, #{updatedTime,jdbcType=DATE} ) diff --git a/aucma-production/src/main/resources/mapper/production/ProdStationCapabilityMapper.xml b/aucma-production/src/main/resources/mapper/production/ProdStationCapabilityMapper.xml index 145a5a9..1a0df1a 100644 --- a/aucma-production/src/main/resources/mapper/production/ProdStationCapabilityMapper.xml +++ b/aucma-production/src/main/resources/mapper/production/ProdStationCapabilityMapper.xml @@ -79,25 +79,27 @@ obj_id, station_code, material_code, standard_ct, shift_cap, day_cap, changeover_min, team_code, status, remark, create_by, create_time, update_by, update_time ) values ( - #{objId}, #{stationCode}, #{materialCode}, #{standardCt}, #{shiftCap}, #{dayCap}, #{changeoverMin}, - #{teamCode}, #{status}, #{remark}, #{createdBy}, #{createdTime}, #{updatedBy}, #{updatedTime} + #{objId,jdbcType=NUMERIC}, #{stationCode,jdbcType=VARCHAR}, #{materialCode,jdbcType=VARCHAR}, + #{standardCt,jdbcType=DECIMAL}, #{shiftCap,jdbcType=DECIMAL}, #{dayCap,jdbcType=DECIMAL}, #{changeoverMin,jdbcType=NUMERIC}, + #{teamCode,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createdBy,jdbcType=VARCHAR}, + #{createdTime,jdbcType=DATE}, #{updatedBy,jdbcType=VARCHAR}, #{updatedTime,jdbcType=DATE} ) update prod_sta_cap - station_code = #{stationCode}, - material_code = #{materialCode}, - standard_ct = #{standardCt}, - shift_cap = #{shiftCap}, - day_cap = #{dayCap}, - changeover_min = #{changeoverMin}, - team_code = #{teamCode}, - status = #{status}, - remark = #{remark}, - update_by = #{updatedBy}, - update_time = #{updatedTime} + station_code = #{stationCode,jdbcType=VARCHAR}, + material_code = #{materialCode,jdbcType=VARCHAR}, + standard_ct = #{standardCt,jdbcType=DECIMAL}, + shift_cap = #{shiftCap,jdbcType=DECIMAL}, + day_cap = #{dayCap,jdbcType=DECIMAL}, + changeover_min = #{changeoverMin,jdbcType=NUMERIC}, + team_code = #{teamCode,jdbcType=VARCHAR}, + status = #{status,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + update_by = #{updatedBy,jdbcType=VARCHAR}, + update_time = #{updatedTime,jdbcType=DATE} where obj_id = #{objId} diff --git a/aucma-production/src/main/resources/mapper/production/ProdTaskPoolMapper.xml b/aucma-production/src/main/resources/mapper/production/ProdTaskPoolMapper.xml index 80a4981..0704ed0 100644 --- a/aucma-production/src/main/resources/mapper/production/ProdTaskPoolMapper.xml +++ b/aucma-production/src/main/resources/mapper/production/ProdTaskPoolMapper.xml @@ -16,7 +16,6 @@ - @@ -51,7 +50,6 @@ tp.owner_user_id, su.nick_name as owner_user_name, nvl(tp.priority_level, 'NORMAL') as priority_level, - oi.device_code, oi.end_date, oi.start_time, oi.end_time as finish_time, @@ -116,19 +114,20 @@ obj_id, order_code, owner_user_id, priority_level, task_remark, create_by, create_time, update_by, update_time ) values ( - #{objId}, #{orderCode}, #{ownerUserId}, #{priorityLevel}, #{remark}, - #{createdBy}, #{createdTime}, #{updatedBy}, #{updatedTime} + #{objId,jdbcType=NUMERIC}, #{orderCode,jdbcType=VARCHAR}, #{ownerUserId,jdbcType=NUMERIC}, + #{priorityLevel,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, + #{createdBy,jdbcType=VARCHAR}, #{createdTime,jdbcType=DATE}, #{updatedBy,jdbcType=VARCHAR}, #{updatedTime,jdbcType=DATE} ) update prod_task_pool - owner_user_id = #{ownerUserId}, - priority_level = #{priorityLevel}, - task_remark = #{remark}, - update_by = #{updatedBy}, - update_time = #{updatedTime} + owner_user_id = #{ownerUserId,jdbcType=NUMERIC}, + priority_level = #{priorityLevel,jdbcType=VARCHAR}, + task_remark = #{remark,jdbcType=VARCHAR}, + update_by = #{updatedBy,jdbcType=VARCHAR}, + update_time = #{updatedTime,jdbcType=DATE} where order_code = #{orderCode} @@ -142,11 +141,11 @@ update base_orderinfo - set execution_status = #{executionStatus}, - start_time = case when #{executionStatus} = 'RUNNING' and start_time is null then sysdate else start_time end, - end_time = case when #{executionStatus} = 'COMPLETED' then sysdate else end_time end, - complete_date = case when #{executionStatus} = 'COMPLETED' then trunc(sysdate) else complete_date end, - updated_time = #{updatedTime} - where order_code = #{orderCode} + set execution_status = #{executionStatus,jdbcType=VARCHAR}, + start_time = case when #{executionStatus,jdbcType=VARCHAR} = 'RUNNING' and start_time is null then sysdate else start_time end, + end_time = case when #{executionStatus,jdbcType=VARCHAR} = 'COMPLETED' then sysdate else end_time end, + complete_date = case when #{executionStatus,jdbcType=VARCHAR} = 'COMPLETED' then trunc(sysdate) else complete_date end, + updated_time = #{updatedTime,jdbcType=DATE} + where order_code = #{orderCode,jdbcType=VARCHAR} diff --git a/aucma-production/src/main/resources/mapper/production/ProdTeamShiftMapper.xml b/aucma-production/src/main/resources/mapper/production/ProdTeamShiftMapper.xml index af3d80f..92bcf75 100644 --- a/aucma-production/src/main/resources/mapper/production/ProdTeamShiftMapper.xml +++ b/aucma-production/src/main/resources/mapper/production/ProdTeamShiftMapper.xml @@ -81,24 +81,25 @@ obj_id, team_code, shift_date, shift_code, leader_user_id, line_code, area_desc, status, remark, create_by, create_time, update_by, update_time ) values ( - #{objId}, #{teamCode}, #{shiftDate}, #{shiftCode}, #{leaderUserId}, #{lineCode}, #{areaDesc}, #{status}, - #{remark}, #{createdBy}, #{createdTime}, #{updatedBy}, #{updatedTime} + #{objId,jdbcType=NUMERIC}, #{teamCode,jdbcType=VARCHAR}, #{shiftDate,jdbcType=DATE}, #{shiftCode,jdbcType=VARCHAR}, + #{leaderUserId,jdbcType=NUMERIC}, #{lineCode,jdbcType=VARCHAR}, #{areaDesc,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, + #{remark,jdbcType=VARCHAR}, #{createdBy,jdbcType=VARCHAR}, #{createdTime,jdbcType=DATE}, #{updatedBy,jdbcType=VARCHAR}, #{updatedTime,jdbcType=DATE} ) update prod_team_sch - team_code = #{teamCode}, - shift_date = #{shiftDate}, - shift_code = #{shiftCode}, - leader_user_id = #{leaderUserId}, - line_code = #{lineCode}, - area_desc = #{areaDesc}, - status = #{status}, - remark = #{remark}, - update_by = #{updatedBy}, - update_time = #{updatedTime} + team_code = #{teamCode,jdbcType=VARCHAR}, + shift_date = #{shiftDate,jdbcType=DATE}, + shift_code = #{shiftCode,jdbcType=VARCHAR}, + leader_user_id = #{leaderUserId,jdbcType=NUMERIC}, + line_code = #{lineCode,jdbcType=VARCHAR}, + area_desc = #{areaDesc,jdbcType=VARCHAR}, + status = #{status,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + update_by = #{updatedBy,jdbcType=VARCHAR}, + update_time = #{updatedTime,jdbcType=DATE} where obj_id = #{objId}