Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.7.5_4.7.6_oracle.sql =================================================================== diff -u -r18379 -r18489 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.7.5_4.7.6_oracle.sql (.../4.7.5_4.7.6_oracle.sql) (revision 18379) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.7.5_4.7.6_oracle.sql (.../4.7.5_4.7.6_oracle.sql) (revision 18489) @@ -5,6 +5,8 @@ ( select r.id,r.additionalAmount,'',r.additionalTime,r.amount,0,r.damageErrorDepartType,r.damageErrorMaterialType,r.departCodeForId,r.errorType,r.idCardInstanceID,'',r.lostIDCardInstanceBarcode,r.materialCost,r.materialDefinitionId,r.materialName,r.packingTask_ID,r.settlementPrice,r.tousseDefinitionId,r.tousseItem_ID,r.tousseName,'回收误差',r.classifyBasket_id,r.depart,r.departCode,r.handleDepartCode,r.handleDepartName,r.missTime,'',r.warehouseId,r.warehouseName from RecyclingError r where type='回收记录' union all + select r.id,r.additionalAmount,'',r.additionalTime,r.amount,0,r.damageErrorDepartType,r.damageErrorMaterialType,r.departCodeForId,r.errorType,r.idCardInstanceID,'',r.lostIDCardInstanceBarcode,r.materialCost,r.materialDefinitionId,r.materialName,r.packingTask_ID,r.settlementPrice,r.tousseDefinitionId,r.tousseItem_ID,r.tousseName,'装配任务',r.classifyBasket_id,r.depart,r.departCode,r.handleDepartCode,r.handleDepartName,r.missTime,'',r.warehouseId,r.warehouseName from RecyclingError r where type='装配任务' + union all select i.id,i.additionalAmount,i.additionalPerson,i.additionalTime,i.amount,0,i.damageErrorDepartType,i.damageErrorMaterialType,'','',null,i.linkType,'',i.materialCost,i.materialDefinitionId,i.materialName,i.packingTask_ID,i.settlementPrice,i.tousseDefinitionId,i.tousseItem_ID,i.tousseName,'器械报损',i.classifyBasket_id,i.depart,i.departCoding,i.handleDepartCode,i.handleDepartName,i.time,i.damageOfPeople,i.warehouseId,i.warehouseName from RecyclingDamageItem i ); insert into recyclingItem_errorDamage(recyclingItem_id,errorDamageDetail_id) select i.recyclingItemId,i.id from MaterialErrorDamageDetail i where i.recyclingItemId is not null; \ No newline at end of file Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.7.5_4.7.6_sqlserver.sql =================================================================== diff -u -r17519 -r18489 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.7.5_4.7.6_sqlserver.sql (.../4.7.5_4.7.6_sqlserver.sql) (revision 17519) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.7.5_4.7.6_sqlserver.sql (.../4.7.5_4.7.6_sqlserver.sql) (revision 18489) @@ -5,8 +5,11 @@ set identity_insert RecyclingItem OFF; insert into MaterialErrorDamageDetail(additionalAmount,additionalPerson,additionalTime,amount,amountPerTousse,damageErrorDepartType,damageErrorMaterialType,departCodeForId,errorType,idCardInstanceId,linkType,lostIDCardInstanceBarcode,materialCost,materialDefinitionId,materialName,packingTaskId,settlementPrice,tousseDefinitionId,recyclingItemId,tousseName,type,classifyBasket_id,depart,departCode,handleDepartCode,handleDepartName,operationTime,operator,warehouseId,warehouseName) - (select r.additionalAmount,'',r.additionalTime,r.amount,0,r.damageErrorDepartType,r.damageErrorMaterialType,r.departCodeForId,r.errorType,r.idCardInstanceID,'',r.lostIDCardInstanceBarcode,r.materialCost,r.materialDefinitionId,r.materialName,r.packingTask_ID,r.settlementPrice,r.tousseDefinitionId,r.tousseItem_ID,r.tousseName,'回收误差',r.classifyBasket_id,r.depart,r.departCode,r.handleDepartCode,r.handleDepartName,r.missTime,'',r.warehouseId,r.warehouseName from RecyclingError r + ( + select r.id,r.additionalAmount,'',r.additionalTime,r.amount,0,r.damageErrorDepartType,r.damageErrorMaterialType,r.departCodeForId,r.errorType,r.idCardInstanceID,'',r.lostIDCardInstanceBarcode,r.materialCost,r.materialDefinitionId,r.materialName,r.packingTask_ID,r.settlementPrice,r.tousseDefinitionId,r.tousseItem_ID,r.tousseName,'回收误差',r.classifyBasket_id,r.depart,r.departCode,r.handleDepartCode,r.handleDepartName,r.missTime,'',r.warehouseId,r.warehouseName from RecyclingError r where type='回收记录' union all - select i.additionalAmount,i.additionalPerson,i.additionalTime,i.amount,0,i.damageErrorDepartType,i.damageErrorMaterialType,'','',null,i.linkType,'',i.materialCost,i.materialDefinitionId,i.materialName,i.packingTask_ID,i.settlementPrice,i.tousseDefinitionId,i.tousseItem_ID,i.tousseName,'器械报损',i.classifyBasket_id,i.depart,i.departCoding,i.handleDepartCode,i.handleDepartName,i.time,i.damageOfPeople,i.warehouseId,i.warehouseName from RecyclingDamageItem i + select r.id,r.additionalAmount,'',r.additionalTime,r.amount,0,r.damageErrorDepartType,r.damageErrorMaterialType,r.departCodeForId,r.errorType,r.idCardInstanceID,'',r.lostIDCardInstanceBarcode,r.materialCost,r.materialDefinitionId,r.materialName,r.packingTask_ID,r.settlementPrice,r.tousseDefinitionId,r.tousseItem_ID,r.tousseName,'装配任务',r.classifyBasket_id,r.depart,r.departCode,r.handleDepartCode,r.handleDepartName,r.missTime,'',r.warehouseId,r.warehouseName from RecyclingError r where type='装配任务' + union all + select i.id,i.additionalAmount,i.additionalPerson,i.additionalTime,i.amount,0,i.damageErrorDepartType,i.damageErrorMaterialType,'','',null,i.linkType,'',i.materialCost,i.materialDefinitionId,i.materialName,i.packingTask_ID,i.settlementPrice,i.tousseDefinitionId,i.tousseItem_ID,i.tousseName,'器械报损',i.classifyBasket_id,i.depart,i.departCoding,i.handleDepartCode,i.handleDepartName,i.time,i.damageOfPeople,i.warehouseId,i.warehouseName from RecyclingDamageItem i ); insert into recyclingItem_errorDamage(recyclingItem_id,errorDamageDetail_id) select i.recyclingItemId,i.id from MaterialErrorDamageDetail i where i.recyclingItemId is not null; \ No newline at end of file